diff --git a/iqm5q/parameters.json b/iqm5q/parameters.json
index a52db1d9..894d1ba1 100644
--- a/iqm5q/parameters.json
+++ b/iqm5q/parameters.json
@@ -134,7 +134,7 @@
                     "duration": 40,
                     "amplitude": 0.3489192409182933,
                     "shape": "Gaussian(5)",
-                    "frequency": 4255906757,
+                    "frequency": 4255850000,
                     "relative_start": 0,
                     "phase": 0,
                     "type": "qd"
@@ -161,9 +161,9 @@
             "2": {
                 "RX": {
                     "duration": 40,
-                    "amplitude": 0.3098223497260254,
+                    "amplitude": 0.29584542709021805,
                     "shape": "Gaussian(5)",
-                    "frequency": 4541598050,
+                    "frequency": 4541477000,
                     "relative_start": 0,
                     "phase": 0,
                     "type": "qd"
@@ -219,7 +219,7 @@
             "4": {
                 "RX": {
                     "duration": 40,
-                    "amplitude": 0.25241960712501244,
+                    "amplitude": 0.30041093295745597,
                     "shape": "Gaussian(5)",
                     "frequency": 4295997326,
                     "relative_start": 0,
@@ -336,35 +336,27 @@
             "2-4": {
                 "CZ": [
                     {
-                        "duration": 120,
-                        "amplitude": 0.2416,
+                        "duration": 81,
+                        "amplitude": 0.0725,
                         "shape": "Custom([0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.99934855, 0.9987093, 0.99808201, 0.99746647, 0.99686246, 0.99626975, 0.99568814, 0.99511741, 0.99455737, 0.99400782, 0.99346855, 0.99293938, 0.99242012, 0.99191058, 0.99141058, 0.99091994, 0.99043848, 0.98996604, 0.98950244, 0.98904752, 0.98860112, 0.98816308, 0.98773323, 0.98731144, 0.98689754, 0.98649139, 0.98609284, 0.98570176, 0.98531799, 0.98494141, 0.98457189, 0.98420927, 0.98385345, 0.98350429, 0.98316167, 0.98282546, 0.98249554, 0.98217181, 0.98185413, 0.9815424, 0.9812365, 0.98093634, 0.98064179, 0.98035276, 0.98006913, 0.97979082, 0.97951772, 0.97924973, 0.97898676, 0.97872871, 0.97847549, 0.97822702, 0.97798319, 0.97774393, 0.97750915, 0.97727876, 0.97705269, 0.97683085, 0.97661316, 0.97639955, 0.97618994, 0.97598425, 0.97578242, 0.97558436, 0.97539001, 0.9751993, 0.97501215, 0.97482852, 0.97464832, 0.97447149, 0.97429797, 0.97412771, 0.97396063, 0.97379667, 0.97363579, 0.97347792, 0.97332301, 0.97317099, 0.97302182, 0.97287545, 0.97273181, 0.97259087, 0.97245256, 0.97231684, 0.97218366, 0.97205298, 0.97192474, 0.9717989, 0.97167542, 0.97155425, 0.97143535, 0.97131868, 0.97120419, 0.97109184, 0.9709816, 0.97087342, 0.97076726, 0.97066309, 0.97056088, 0.97046057, 0.97036215, 0.97026557, 0.97017079, 0.97007779, 0.96998653, 0.96989698, 0.96980911, 0.96972288, 0.96963826, 0.96955523, 0.96947376, 0.96939381, 0.96931535, 0.96923837, 0.96916282, 0.96908869, 0.96901595, 0.96894457, 0.96887453, 0.9688058, 0.96873835, 0.96867217, 0.96860722, 0.9685435, 0.96848096, 0.9684196, 0.96835938, 0.96830029, 0.96824231, 0.96818541, 0.96812958, 0.9680748, 0.96802104, 0.96796828, 0.96791652, 0.96786572, 0.96781588, 0.96776696, 0.96771897, 0.96767187, 0.96762565, 0.9675803, 0.9675358, 0.96749213, 0.96744928, 0.96740723, 0.96736596, 0.96732547, 0.96728574, 0.96724676, 0.9672085, 0.96717096, 0.96713412, 0.96709797, 0.9670625, 0.96702769, 0.96699353, 0.96696001, 0.96692712, 0.96689485, 0.96686318, 0.9668321, 0.96680161, 0.96677168, 0.96674232, 0.96671351, 0.96668523, 0.96665749, 0.96663026, 0.0, 0.0, 0.0, 0.0, 0.0])",
                         "qubit": 2,
                         "relative_start": 0,
                         "type": "qf"
                     },
                     {
-                        "type": "coupler",
-                        "duration": 120,
-                        "amplitude": 0.15,
-                        "shape": "Custom([0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.99934855, 0.9987093, 0.99808201, 0.99746647, 0.99686246, 0.99626975, 0.99568814, 0.99511741, 0.99455737, 0.99400782, 0.99346855, 0.99293938, 0.99242012, 0.99191058, 0.99141058, 0.99091994, 0.99043848, 0.98996604, 0.98950244, 0.98904752, 0.98860112, 0.98816308, 0.98773323, 0.98731144, 0.98689754, 0.98649139, 0.98609284, 0.98570176, 0.98531799, 0.98494141, 0.98457189, 0.98420927, 0.98385345, 0.98350429, 0.98316167, 0.98282546, 0.98249554, 0.98217181, 0.98185413, 0.9815424, 0.9812365, 0.98093634, 0.98064179, 0.98035276, 0.98006913, 0.97979082, 0.97951772, 0.97924973, 0.97898676, 0.97872871, 0.97847549, 0.97822702, 0.97798319, 0.97774393, 0.97750915, 0.97727876, 0.97705269, 0.97683085, 0.97661316, 0.97639955, 0.97618994, 0.97598425, 0.97578242, 0.97558436, 0.97539001, 0.9751993, 0.97501215, 0.97482852, 0.97464832, 0.97447149, 0.97429797, 0.97412771, 0.97396063, 0.97379667, 0.97363579, 0.97347792, 0.97332301, 0.97317099, 0.97302182, 0.97287545, 0.97273181, 0.97259087, 0.97245256, 0.97231684, 0.97218366, 0.97205298, 0.97192474, 0.9717989, 0.97167542, 0.97155425, 0.97143535, 0.97131868, 0.97120419, 0.97109184, 0.9709816, 0.97087342, 0.97076726, 0.97066309, 0.97056088, 0.97046057, 0.97036215, 0.97026557, 0.97017079, 0.97007779, 0.96998653, 0.96989698, 0.96980911, 0.96972288, 0.96963826, 0.96955523, 0.96947376, 0.96939381, 0.96931535, 0.96923837, 0.96916282, 0.96908869, 0.96901595, 0.96894457, 0.96887453, 0.9688058, 0.96873835, 0.96867217, 0.96860722, 0.9685435, 0.96848096, 0.9684196, 0.96835938, 0.96830029, 0.96824231, 0.96818541, 0.96812958, 0.9680748, 0.96802104, 0.96796828, 0.96791652, 0.96786572, 0.96781588, 0.96776696, 0.96771897, 0.96767187, 0.96762565, 0.9675803, 0.9675358, 0.96749213, 0.96744928, 0.96740723, 0.96736596, 0.96732547, 0.96728574, 0.96724676, 0.9672085, 0.96717096, 0.96713412, 0.96709797, 0.9670625, 0.96702769, 0.96699353, 0.96696001, 0.96692712, 0.96689485, 0.96686318, 0.9668321, 0.96680161, 0.96677168, 0.96674232, 0.96671351, 0.96668523, 0.96665749, 0.96663026, 0.0, 0.0, 0.0, 0.0, 0.0])",
-                        "coupler": 4,
-                        "relative_start": 0
-                    }
-                ],
-                "iSWAP": [
-                    {
-                        "duration": 120,
-                        "amplitude": 0.18378,
-                        "shape": "Custom([0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.99934855, 0.9987093, 0.99808201, 0.99746647, 0.99686246, 0.99626975, 0.99568814, 0.99511741, 0.99455737, 0.99400782, 0.99346855, 0.99293938, 0.99242012, 0.99191058, 0.99141058, 0.99091994, 0.99043848, 0.98996604, 0.98950244, 0.98904752, 0.98860112, 0.98816308, 0.98773323, 0.98731144, 0.98689754, 0.98649139, 0.98609284, 0.98570176, 0.98531799, 0.98494141, 0.98457189, 0.98420927, 0.98385345, 0.98350429, 0.98316167, 0.98282546, 0.98249554, 0.98217181, 0.98185413, 0.9815424, 0.9812365, 0.98093634, 0.98064179, 0.98035276, 0.98006913, 0.97979082, 0.97951772, 0.97924973, 0.97898676, 0.97872871, 0.97847549, 0.97822702, 0.97798319, 0.97774393, 0.97750915, 0.97727876, 0.97705269, 0.97683085, 0.97661316, 0.97639955, 0.97618994, 0.97598425, 0.97578242, 0.97558436, 0.97539001, 0.9751993, 0.97501215, 0.97482852, 0.97464832, 0.97447149, 0.97429797, 0.97412771, 0.97396063, 0.97379667, 0.97363579, 0.97347792, 0.97332301, 0.97317099, 0.97302182, 0.97287545, 0.97273181, 0.97259087, 0.97245256, 0.97231684, 0.97218366, 0.97205298, 0.97192474, 0.9717989, 0.97167542, 0.97155425, 0.97143535, 0.97131868, 0.97120419, 0.97109184, 0.9709816, 0.97087342, 0.97076726, 0.97066309, 0.97056088, 0.97046057, 0.97036215, 0.97026557, 0.97017079, 0.97007779, 0.96998653, 0.96989698, 0.96980911, 0.96972288, 0.96963826, 0.96955523, 0.96947376, 0.96939381, 0.96931535, 0.96923837, 0.96916282, 0.96908869, 0.96901595, 0.96894457, 0.96887453, 0.9688058, 0.96873835, 0.96867217, 0.96860722, 0.9685435, 0.96848096, 0.9684196, 0.96835938, 0.96830029, 0.96824231, 0.96818541, 0.96812958, 0.9680748, 0.96802104, 0.96796828, 0.96791652, 0.96786572, 0.96781588, 0.96776696, 0.96771897, 0.96767187, 0.96762565, 0.9675803, 0.9675358, 0.96749213, 0.96744928, 0.96740723, 0.96736596, 0.96732547, 0.96728574, 0.96724676, 0.9672085, 0.96717096, 0.96713412, 0.96709797, 0.9670625, 0.96702769, 0.96699353, 0.96696001, 0.96692712, 0.96689485, 0.96686318, 0.9668321, 0.96680161, 0.96677168, 0.96674232, 0.96671351, 0.96668523, 0.96665749, 0.96663026, 0.0, 0.0, 0.0, 0.0, 0.0])",
-                        "qubit": 2,
-                        "relative_start": 0,
-                        "type": "qf"
+                        "type": "virtual_z",
+                        "phase": -4.503611860884899,
+                        "qubit": 2
                     },
+                    {
+                        "type": "virtual_z",
+                        "phase": -4.603277219967731,
+                        "qubit": 4
+                    },                    
                     {
                         "type": "coupler",
-                        "duration": 120,
-                        "amplitude": 0.14925,
+                        "duration": 81,
+                        "amplitude": 0.1241,
                         "shape": "Custom([0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.99934855, 0.9987093, 0.99808201, 0.99746647, 0.99686246, 0.99626975, 0.99568814, 0.99511741, 0.99455737, 0.99400782, 0.99346855, 0.99293938, 0.99242012, 0.99191058, 0.99141058, 0.99091994, 0.99043848, 0.98996604, 0.98950244, 0.98904752, 0.98860112, 0.98816308, 0.98773323, 0.98731144, 0.98689754, 0.98649139, 0.98609284, 0.98570176, 0.98531799, 0.98494141, 0.98457189, 0.98420927, 0.98385345, 0.98350429, 0.98316167, 0.98282546, 0.98249554, 0.98217181, 0.98185413, 0.9815424, 0.9812365, 0.98093634, 0.98064179, 0.98035276, 0.98006913, 0.97979082, 0.97951772, 0.97924973, 0.97898676, 0.97872871, 0.97847549, 0.97822702, 0.97798319, 0.97774393, 0.97750915, 0.97727876, 0.97705269, 0.97683085, 0.97661316, 0.97639955, 0.97618994, 0.97598425, 0.97578242, 0.97558436, 0.97539001, 0.9751993, 0.97501215, 0.97482852, 0.97464832, 0.97447149, 0.97429797, 0.97412771, 0.97396063, 0.97379667, 0.97363579, 0.97347792, 0.97332301, 0.97317099, 0.97302182, 0.97287545, 0.97273181, 0.97259087, 0.97245256, 0.97231684, 0.97218366, 0.97205298, 0.97192474, 0.9717989, 0.97167542, 0.97155425, 0.97143535, 0.97131868, 0.97120419, 0.97109184, 0.9709816, 0.97087342, 0.97076726, 0.97066309, 0.97056088, 0.97046057, 0.97036215, 0.97026557, 0.97017079, 0.97007779, 0.96998653, 0.96989698, 0.96980911, 0.96972288, 0.96963826, 0.96955523, 0.96947376, 0.96939381, 0.96931535, 0.96923837, 0.96916282, 0.96908869, 0.96901595, 0.96894457, 0.96887453, 0.9688058, 0.96873835, 0.96867217, 0.96860722, 0.9685435, 0.96848096, 0.9684196, 0.96835938, 0.96830029, 0.96824231, 0.96818541, 0.96812958, 0.9680748, 0.96802104, 0.96796828, 0.96791652, 0.96786572, 0.96781588, 0.96776696, 0.96771897, 0.96767187, 0.96762565, 0.9675803, 0.9675358, 0.96749213, 0.96744928, 0.96740723, 0.96736596, 0.96732547, 0.96728574, 0.96724676, 0.9672085, 0.96717096, 0.96713412, 0.96709797, 0.9670625, 0.96702769, 0.96699353, 0.96696001, 0.96692712, 0.96689485, 0.96686318, 0.9668321, 0.96680161, 0.96677168, 0.96674232, 0.96671351, 0.96668523, 0.96665749, 0.96663026, 0.0, 0.0, 0.0, 0.0, 0.0])",
                         "coupler": 4,
                         "relative_start": 0
@@ -393,9 +385,9 @@
                 "peak_voltage": 0,
                 "pi_pulse_amplitude": 0.3600081364846137,
                 "resonator_depletion_time": 0,
-                "T1": 8600,
-                "T2": 3240,
-                "T2_spin_echo": 23316,
+                "T1": 19200,
+                "T2": 25000,
+                "T2_spin_echo": 25000,
                 "state0_voltage": 0,
                 "state1_voltage": 0,
                 "mean_gnd_states": [
@@ -433,9 +425,9 @@
                 "peak_voltage": 0,
                 "pi_pulse_amplitude": 0.3489192409182933,
                 "resonator_depletion_time": 0,
-                "T1": 20770,
-                "T2": 18700,
-                "T2_spin_echo": 13280,
+                "T1": 11600,
+                "T2": 9800,
+                "T2_spin_echo": 10300,
                 "state0_voltage": 0,
                 "state1_voltage": 0,
                 "mean_gnd_states": [
@@ -464,28 +456,28 @@
                 "Ec": 0,
                 "Ej": 0.0,
                 "g": 0,
-                "assignment_fidelity": 0.9209576033168383,
-                "readout_fidelity": 0.8419152066336766,
+                "assignment_fidelity": 0.9241674468369667,
+                "readout_fidelity": 0.8483348936739334,
                 "gate_fidelity": 0.0,
                 "effective_temperature": 0.0,
                 "peak_voltage": 0,
                 "pi_pulse_amplitude": 0.3098223497260254,
                 "resonator_depletion_time": 0,
-                "T1": 17300,
-                "T2": 23600,
-                "T2_spin_echo": 20453,
+                "T1": 13000,
+                "T2": 21000,
+                "T2_spin_echo": 17000,
                 "state0_voltage": 0,
                 "state1_voltage": 0,
                 "mean_gnd_states": [
-                    0.000514039622246863,
-                    -0.0009098295596484101
+                    0.0005146410671822828,
+                    -0.0009293851826228234
                 ],
                 "mean_exc_states": [
-                    -0.00020228877105553332,
-                    -0.001493964771562286
+                    -0.000226079116161407,
+                    -0.0015320593314041289
                 ],
-                "threshold": 0.0006749041404865062,
-                "iq_angle": 2.4574973414065187,
+                "threshold": 0.0006850905635391022,
+                "iq_angle": 2.4585942029851635,
                 "mixer_drive_g": 0.0,
                 "mixer_drive_phi": 0.0,
                 "mixer_readout_g": 0.0,
@@ -509,9 +501,9 @@
                 "peak_voltage": 0,
                 "pi_pulse_amplitude": 0,
                 "resonator_depletion_time": 0,
-                "T1": 23120,
-                "T2": 2534,
-                "T2_spin_echo": 2267,
+                "T1": 18300,
+                "T2": 2900,
+                "T2_spin_echo": 5900,
                 "state0_voltage": 0,
                 "state1_voltage": 0,
                 "mean_gnd_states": [
@@ -540,28 +532,28 @@
                 "Ec": 0,
                 "Ej": 0.0,
                 "g": 0,
-                "assignment_fidelity": 0.9119967901564798,
-                "readout_fidelity": 0.8239935803129598,
+                "assignment_fidelity": 0.9332620034773305,
+                "readout_fidelity": 0.866524006954661,
                 "gate_fidelity": 0.0,
                 "effective_temperature": 0.0,
                 "peak_voltage": 0,
                 "pi_pulse_amplitude": 0,
                 "resonator_depletion_time": 0,
-                "T1": 7361,
-                "T2": 5500,
-                "T2_spin_echo": 5361,
+                "T1": 6130,
+                "T2": 4300,
+                "T2_spin_echo": 9300,
                 "state0_voltage": 0,
                 "state1_voltage": 0,
                 "mean_gnd_states": [
-                    0.0012863691031593642,
-                    0.00037795934837447925
+                    0.0012933975801029975,
+                    0.0003723054283100307
                 ],
                 "mean_exc_states": [
-                    0.002490190827183506,
-                    -0.0011315504397494767
+                    0.0025545607082040644,
+                    -0.0012254142144034093
                 ],
-                "threshold": 0.0010601585523046205,
-                "iq_angle": 0.8975866285213256,
+                "threshold": 0.0010078841063214257,
+                "iq_angle": 0.9025819008158221,
                 "mixer_drive_g": 0.0,
                 "mixer_drive_phi": 0.0,
                 "mixer_readout_g": 0.0,