diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/01a_manual_mixer_calibration.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/01a_manual_mixer_calibration.py
new file mode 100644
index 000000000..71b3b9162
--- /dev/null
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/01a_manual_mixer_calibration.py
@@ -0,0 +1,114 @@
+"""
+        MIXER CALIBRATION
+The program is designed to play a continuous single tone to calibrate an IQ mixer. To do this, connect the mixer's
+output to a spectrum analyzer. Adjustments for the DC offsets, gain, and phase must be made manually.
+
+If you have access to the API for retrieving data from the spectrum analyzer, you can utilize the commented lines below
+to semi-automate the process.
+
+Before proceeding to the next node, take the following steps:
+    - Update the DC offsets in the configuration at: config/controllers/"con1"/analog_outputs.
+    - Modify the DC gain and phase for the IQ signals in the configuration, under either:
+      mixer_qubit_g & mixer_qubit_g or mixer_resonator_g & mixer_resonator_g.
+"""
+
+from qm import QuantumMachinesManager
+from qm.qua import *
+from configuration import *
+
+###################
+# The QUA program #
+###################
+element = "rr1"
+
+with program() as cw_output:
+    with infinite_loop_():
+        # It is best to calibrate LO leakage first and without any power played (cf. note below)
+        play("cw" * amp(0), element)
+
+#####################################
+#  Open Communication with the QOP  #
+#####################################
+qmm = QuantumMachinesManager(host=qop_ip, port=qop_port, cluster_name=cluster_name, octave=octave_config)
+qm = qmm.open_qm(config)
+
+job = qm.execute(cw_output)
+
+# When done, the halt command can be called and the offsets can be written directly into the config file.
+
+# job.halt()
+
+# These are the 2 commands used to correct for mixer imperfections. The first is used to set the DC of the `I` and `Q`
+# channels to compensate for the LO leakage. The 2nd command is used to correct for the phase and amplitude mismatches
+# between the channels.
+# The output of the IQ Mixer should be connected to a spectrum analyzer and values should be chosen as to minimize the
+# unwanted peaks.
+# If python can read the output of the spectrum analyzer, then this process can be automated and the correct values can
+# be found using an optimization method such as Nelder-Mead:
+# https://docs.scipy.org/doc/scipy/reference/optimize.minimize-neldermead.html
+
+# qm.set_output_dc_offset_by_element('rr1', ('I', 'Q'), (-0.001, 0.003))
+# qm.set_mixer_correction('mixer_resonator', int(resonator_IF_q1), int(resonator_LO), IQ_imbalance(0.015, 0.01))
+
+# Note that the LO leakage (DC Offset) depends on the 'I' & 'Q' powers, it is advised to run this step with no input power.
+# This will ensure that there is no LO leakage while the pulses are not played in the case where the is no switch.
+# This can be achieved by changing the line above to `play("cw" * amp(0), "qubit")`
+
+# Automatic LO leakage correction
+# centers = [0.5, 0]
+# span = 0.1
+#
+# fig1 = plt.figure()
+# for n in range(3):
+#     offset_i = np.linspace(centers[0] - span, centers[0] + span, 21)
+#     offset_q = np.linspace(centers[1] - span, centers[1] + span, 31)
+#     lo_leakage = np.zeros((len(offset_q), len(offset_i)))
+#     for i in range(len(offset_i)):
+#         for q in range(len(offset_q)):
+#             qm.set_output_dc_offset_by_element(element, ("I", "Q"), (offset_i[i], offset_q[q]))
+#             sleep(0.01)
+#             # Write functions to extract the lo leakage from the spectrum analyzer
+#             # lo_leakage[q][i] =
+#     minimum = np.argwhere(lo_leakage == np.min(lo_leakage))[0]
+#     centers = [offset_i[minimum[0]], offset_q[minimum[1]]]
+#     span = span / 10
+#     plt.subplot(131)
+#     plt.pcolor(offset_i, offset_q, lo_leakage.transpose())
+#     plt.xlabel("I offset [V]")
+#     plt.ylabel("Q offset [V]")
+#     plt.title(f"Minimum at (I={centers[0]:.3f}, Q={centers[1]:.3f}) = {lo_leakage[minimum[0]][minimum[1]]:.1f} dBm")
+# plt.suptitle(f"LO leakage correction for {element}")
+#
+# print(f"For {element}, I offset is {centers[0]} and Q offset is {centers[1]}")
+#
+# # Automatic image cancellation
+# centers = [0.5, 0]
+# span = [0.2, 0.5]
+#
+# fig2 = plt.figure()
+# for n in range(3):
+#     gain = np.linspace(centers[0] - span, centers[0] + span, 21)
+#     phase = np.linspace(centers[1] - span, centers[1] + span, 31)
+#     image = np.zeros((len(phase), len(gain)))
+#     for g in range(len(gain)):
+#         for p in range(len(phase)):
+#             qm.set_mixer_correction(
+#                 config["elements"][element]["mixInputs"]["mixer"],
+#                 int(config["elements"][element]["intermediate_frequency"]),
+#                 int(config["elements"][element]["mixInputs"]["lo_frequency"]),
+#                 IQ_imbalance(gain[g], phase[p]),
+#             )
+#             sleep(0.01)
+#             # Write functions to extract the image from the spectrum analyzer
+#             # image[q][i] =
+#     minimum = np.argwhere(image == np.min(image))[0]
+#     centers = [gain[minimum[0]], phase[minimum[1]]]
+#     span = (np.array(span) / 10).tolist()
+#     plt.subplot(131)
+#     plt.pcolor(gain, phase, image.transpose())
+#     plt.xlabel("Gain")
+#     plt.ylabel("Phase imbalance [rad]")
+#     plt.title(f"Minimum at (I={centers[0]:.3f}, Q={centers[1]:.3f}) = {image[minimum[0]][minimum[1]]:.1f} dBm")
+# plt.suptitle(f"Image cancellation for {element}")
+#
+# print(f"For {element}, gain is {centers[0]} and phase is {centers[1]}")
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/01b_octave_clock_and_calibration.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/01b_octave_clock_and_calibration.py
new file mode 100644
index 000000000..f95ac1f8e
--- /dev/null
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/01b_octave_clock_and_calibration.py
@@ -0,0 +1,32 @@
+"""
+This file is used to configure the Octave's clock and do the automatic calibration.
+"""
+
+from qm import QuantumMachinesManager
+from qm.octave import ClockMode
+from configuration import *
+
+
+# Configure the Octave according to the elements settings and calibrate
+qmm = QuantumMachinesManager(host=qop_ip, port=qop_port, octave=octave_config, log_level="ERROR")
+qm = qmm.open_qm(config)
+
+##################
+# Clock settings #
+##################
+qm.octave.set_clock("octave1", clock_mode=ClockMode.Internal)
+# If using external LO change this line to one of the following:
+#     qm.octave.set_clock("octave1", clock_mode=ClockMode.External_10MHz)
+#     qm.octave.set_clock("octave1", clock_mode=ClockMode.External_100MHz)
+#     qm.octave.set_clock("octave1", clock_mode=ClockMode.External_1000MHz)
+
+##################
+# Calibration #
+##################
+calibration = True
+
+if calibration:
+    elements = ["rr1", "rr2", "q1_xy", "q2_xy"]
+    for element in elements:
+        print("-" * 37 + f" Calibrates {element}")
+        qm.calibrate_element(element)
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/01_time_of_flight.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/02_time_of_flight.py
similarity index 100%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/01_time_of_flight.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/02_time_of_flight.py
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/02_resonator_spectroscopy_single.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/03_resonator_spectroscopy_single.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/02_resonator_spectroscopy_single.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/03_resonator_spectroscopy_single.py
index d2a86a9cf..af0709002 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/02_resonator_spectroscopy_single.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/03_resonator_spectroscopy_single.py
@@ -17,7 +17,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager, SimulationConfig
-from configuration_mw_fem import *
+from configuration import *
 from qualang_tools.results import fetching_tool
 from qualang_tools.loops import from_array
 import matplotlib.pyplot as plt
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/03_resonator_spectroscopy_multiplexed.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/04_resonator_spectroscopy_multiplexed.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/03_resonator_spectroscopy_multiplexed.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/04_resonator_spectroscopy_multiplexed.py
index 89728eb8a..40d50cf40 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/03_resonator_spectroscopy_multiplexed.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/04_resonator_spectroscopy_multiplexed.py
@@ -17,7 +17,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager, SimulationConfig
-from configuration_mw_fem import *
+from configuration import *
 from qualang_tools.results import progress_counter, fetching_tool
 from qualang_tools.plot import interrupt_on_close
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/04_resonator_spectroscopy_vs_amplitude.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/05_resonator_spectroscopy_vs_amplitude.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/04_resonator_spectroscopy_vs_amplitude.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/05_resonator_spectroscopy_vs_amplitude.py
index 34a9fe028..9309b9213 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/04_resonator_spectroscopy_vs_amplitude.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/05_resonator_spectroscopy_vs_amplitude.py
@@ -21,7 +21,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager, SimulationConfig
-from configuration_mw_fem import *
+from configuration import *
 from qualang_tools.results import progress_counter, fetching_tool
 from qualang_tools.plot import interrupt_on_close
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/05_qubit_spectroscopy.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/06_qubit_spectroscopy.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/05_qubit_spectroscopy.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/06_qubit_spectroscopy.py
index 1f26deaa8..62f83b7fa 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/05_qubit_spectroscopy.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/06_qubit_spectroscopy.py
@@ -26,7 +26,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager, SimulationConfig
-from configuration_mw_fem import *
+from configuration import *
 from qualang_tools.results import progress_counter, fetching_tool
 from qualang_tools.plot import interrupt_on_close
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/06_rabi_chevron.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/07_rabi_chevron.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/06_rabi_chevron.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/07_rabi_chevron.py
index 1d898e3e4..a1a9e5327 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/06_rabi_chevron.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/07_rabi_chevron.py
@@ -18,7 +18,7 @@
 from qm import QuantumMachinesManager
 from qm.qua import *
 from qm import SimulationConfig
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.loops import from_array
 from qualang_tools.results import fetching_tool, progress_counter
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/07_power_rabi.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/08_power_rabi.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/07_power_rabi.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/08_power_rabi.py
index f3c6e3316..5fb30a6c7 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/07_power_rabi.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/08_power_rabi.py
@@ -18,7 +18,7 @@
 
 from qm import QuantumMachinesManager, SimulationConfig
 from qm.qua import *
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.loops import from_array
 from qualang_tools.results import fetching_tool, progress_counter
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/08_ramsey_chevron.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09_ramsey_chevron.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/08_ramsey_chevron.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09_ramsey_chevron.py
index 3241c4404..806ffdaf5 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/08_ramsey_chevron.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09_ramsey_chevron.py
@@ -16,7 +16,7 @@
 
 from qm import QuantumMachinesManager, SimulationConfig
 from qm.qua import *
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.loops import from_array
 from qualang_tools.results import fetching_tool
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09a_readout_optimization_freq.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10a_readout_optimization_freq.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09a_readout_optimization_freq.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10a_readout_optimization_freq.py
index b66a6f5bc..31f666b34 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09a_readout_optimization_freq.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10a_readout_optimization_freq.py
@@ -18,7 +18,7 @@
 from qm import QuantumMachinesManager
 from qm.qua import *
 from qm import SimulationConfig
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.loops import from_array
 from qualang_tools.results import fetching_tool, progress_counter
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09b_readout_optimization_amp.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10b_readout_optimization_amp.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09b_readout_optimization_amp.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10b_readout_optimization_amp.py
index 6a357de12..5d22b7ad0 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09b_readout_optimization_amp.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10b_readout_optimization_amp.py
@@ -17,7 +17,7 @@
 
 from qm import QuantumMachinesManager, SimulationConfig
 from qm.qua import *
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.loops import from_array
 from qualang_tools.results import fetching_tool, progress_counter
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09c_readout_optimization_duration.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10c_readout_optimization_duration.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09c_readout_optimization_duration.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10c_readout_optimization_duration.py
index 11147e7fd..5a4d9ab03 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09c_readout_optimization_duration.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10c_readout_optimization_duration.py
@@ -4,7 +4,7 @@
 
 from qm import QuantumMachinesManager, SimulationConfig
 from qm.qua import *
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.results import fetching_tool, progress_counter
 import math
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09d_readout_weight_optimization.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10d_readout_weight_optimization.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09d_readout_weight_optimization.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10d_readout_weight_optimization.py
index 2553ab598..50528ec57 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/09d_readout_weight_optimization.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10d_readout_weight_optimization.py
@@ -4,7 +4,7 @@
 
 from qm import QuantumMachinesManager, SimulationConfig
 from qm.qua import *
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.results import fetching_tool, progress_counter
 from qualang_tools.plot import interrupt_on_close
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10_IQ_blobs.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/11_IQ_blobs.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10_IQ_blobs.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/11_IQ_blobs.py
index 586a2e32c..d41e5a2ba 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/10_IQ_blobs.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/11_IQ_blobs.py
@@ -19,7 +19,7 @@
 
 from qm import QuantumMachinesManager, SimulationConfig
 from qm.qua import *
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.results import fetching_tool
 from macros import qua_declaration, multiplexed_readout, active_reset
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/11_T1.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/12_T1.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/11_T1.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/12_T1.py
index fa5c9b98d..7d32e5f1c 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/11_T1.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/12_T1.py
@@ -16,7 +16,7 @@
 
 from qm import QuantumMachinesManager, SimulationConfig
 from qm.qua import *
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.results import fetching_tool
 from qualang_tools.plot import interrupt_on_close
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/12_T2echo.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/13_T2echo.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/12_T2echo.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/13_T2echo.py
index 9228e7200..047222849 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/12_T2echo.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/13_T2echo.py
@@ -4,7 +4,7 @@
 
 from qm import QuantumMachinesManager, SimulationConfig
 from qm.qua import *
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.results import fetching_tool
 from qualang_tools.plot import interrupt_on_close
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/13_T2ramsey.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/14_T2ramsey.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/13_T2ramsey.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/14_T2ramsey.py
index ab57feedb..494638197 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/13_T2ramsey.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/14_T2ramsey.py
@@ -16,7 +16,7 @@
 
 from qm import QuantumMachinesManager, SimulationConfig
 from qm.qua import *
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.loops import from_array
 from qualang_tools.results import fetching_tool
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/14a_ac_stark_calibration.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/15a_ac_stark_calibration.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/14a_ac_stark_calibration.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/15a_ac_stark_calibration.py
index a8b10a362..f72626873 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/14a_ac_stark_calibration.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/15a_ac_stark_calibration.py
@@ -22,7 +22,7 @@
 
 from qm import QuantumMachinesManager, SimulationConfig
 from qm.qua import *
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.loops import from_array
 from qualang_tools.results import fetching_tool, progress_counter
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/14b_drag_calibration.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/15b_drag_calibration.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/14b_drag_calibration.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/15b_drag_calibration.py
index 5959fb2f8..b8c204019 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/14b_drag_calibration.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/15b_drag_calibration.py
@@ -18,7 +18,7 @@
 
 from qm import QuantumMachinesManager, SimulationConfig
 from qm.qua import *
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qualang_tools.loops import from_array
 from qualang_tools.results import fetching_tool, progress_counter
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/15_allxy.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/16_allxy.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/15_allxy.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/16_allxy.py
index bb3f1284f..04f129043 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/15_allxy.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/16_allxy.py
@@ -4,7 +4,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qm import SimulationConfig
 from qualang_tools.results import fetching_tool
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/16a_single_qubit_RB.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17a_single_qubit_RB.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/16a_single_qubit_RB.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17a_single_qubit_RB.py
index ba5636840..a1e59033b 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/16a_single_qubit_RB.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17a_single_qubit_RB.py
@@ -5,7 +5,7 @@
 from qm.qua import *
 from qm import QuantumMachinesManager
 from qm import SimulationConfig
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 import numpy as np
 from qualang_tools.bakery.randomized_benchmark_c1 import c1_table
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/16b_single_qubit_RB_interleaved.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17b_single_qubit_RB_interleaved.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/16b_single_qubit_RB_interleaved.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17b_single_qubit_RB_interleaved.py
index d768056a5..735c25811 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/16b_single_qubit_RB_interleaved.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17b_single_qubit_RB_interleaved.py
@@ -5,7 +5,7 @@
 from qm.qua import *
 from qm import QuantumMachinesManager
 from qm import SimulationConfig
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 import numpy as np
 from qualang_tools.bakery.randomized_benchmark_c1 import c1_table
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17a_CR_time_rabi_1q_QST.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18a_CR_time_rabi_1q_QST.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17a_CR_time_rabi_1q_QST.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18a_CR_time_rabi_1q_QST.py
index ba934e30d..c58200340 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17a_CR_time_rabi_1q_QST.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18a_CR_time_rabi_1q_QST.py
@@ -18,7 +18,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qm import SimulationConfig
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17b_cancelCR_time_rabi_1q_QST.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18b_cancelCR_time_rabi_1q_QST.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17b_cancelCR_time_rabi_1q_QST.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18b_cancelCR_time_rabi_1q_QST.py
index 12bc8b79f..d4b6933b3 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17b_cancelCR_time_rabi_1q_QST.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18b_cancelCR_time_rabi_1q_QST.py
@@ -18,7 +18,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qm import SimulationConfig
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17c_echoCR_time_rabi_1q_QST.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18c_echoCR_time_rabi_1q_QST.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17c_echoCR_time_rabi_1q_QST.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18c_echoCR_time_rabi_1q_QST.py
index 7026ef5d1..b64abd132 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/17c_echoCR_time_rabi_1q_QST.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18c_echoCR_time_rabi_1q_QST.py
@@ -18,7 +18,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qm import SimulationConfig
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18a_CR_calib_unit_hamiltonian_tomography.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19a_CR_calib_unit_hamiltonian_tomography.py
similarity index 100%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18a_CR_calib_unit_hamiltonian_tomography.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19a_CR_calib_unit_hamiltonian_tomography.py
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18b_CR_calib_cr_drive_amplitude.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19b_CR_calib_cr_drive_amplitude.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18b_CR_calib_cr_drive_amplitude.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19b_CR_calib_cr_drive_amplitude.py
index 54151d64e..37d198adb 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18b_CR_calib_cr_drive_amplitude.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19b_CR_calib_cr_drive_amplitude.py
@@ -39,7 +39,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qm import SimulationConfig
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18c_CR_calib_cr_drive_phase.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19c_CR_calib_cr_drive_phase.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18c_CR_calib_cr_drive_phase.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19c_CR_calib_cr_drive_phase.py
index 10a967f9f..1b0d58bc6 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18c_CR_calib_cr_drive_phase.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19c_CR_calib_cr_drive_phase.py
@@ -39,7 +39,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qm import SimulationConfig
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18d_CR_calib_cr_cancel_phase.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19d_CR_calib_cr_cancel_phase.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18d_CR_calib_cr_cancel_phase.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19d_CR_calib_cr_cancel_phase.py
index d3b8096b8..c0b679f8d 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18d_CR_calib_cr_cancel_phase.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19d_CR_calib_cr_cancel_phase.py
@@ -42,7 +42,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qm import SimulationConfig
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18e_CR_calib_cr_cancel_amplitude.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19e_CR_calib_cr_cancel_amplitude.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18e_CR_calib_cr_cancel_amplitude.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19e_CR_calib_cr_cancel_amplitude.py
index d7fbc4077..a77c99619 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18e_CR_calib_cr_cancel_amplitude.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19e_CR_calib_cr_cancel_amplitude.py
@@ -42,7 +42,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qm import SimulationConfig
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18f_CR_calib_cr_driven_ramsey_RCVersion.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19f_CR_calib_cr_driven_ramsey_RCVersion.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18f_CR_calib_cr_driven_ramsey_RCVersion.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19f_CR_calib_cr_driven_ramsey_RCVersion.py
index e8eb4ef93..0d14d2437 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/18f_CR_calib_cr_driven_ramsey_RCVersion.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19f_CR_calib_cr_driven_ramsey_RCVersion.py
@@ -37,7 +37,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qm import SimulationConfig
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19_CNOT.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/20_CNOT.py
similarity index 99%
rename from Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19_CNOT.py
rename to Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/20_CNOT.py
index c9d9a6cbf..b32780316 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/19_CNOT.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/20_CNOT.py
@@ -14,7 +14,7 @@
 
 from qm.qua import *
 from qm import QuantumMachinesManager
-from configuration_mw_fem import *
+from configuration import *
 import matplotlib.pyplot as plt
 from qm import SimulationConfig
 from qualang_tools.loops import from_array
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration.py
index 694f0256b..6f403422a 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration.py
@@ -33,8 +33,8 @@ def IQ_imbalance(g, phi):
 ######################
 # Network parameters #
 ######################
-qop_ip = "172.16.33.101"  # Write the QM router IP address
-cluster_name = "Cluster_83"  # Write your cluster_name if version >= QOP220
+qop_ip = "127.0.0.1"  # Write the QM router IP address
+cluster_name = None  # Write your cluster_name if version >= QOP220
 qop_port = None  # Write the QOP port if version < QOP220
 octave_config = None
 
@@ -419,8 +419,8 @@ def IQ_imbalance(g, phi):
         },
         "cr_cancel_c1t2": {
             "mixInputs": {
-                "I": ("con1", 1),
-                "Q": ("con1", 2),
+                "I": ("con1", 3),
+                "Q": ("con1", 4),
                 "lo_frequency": qubit_LO_q1,
                 "mixer": "mixer_qubit_q1",
             },
@@ -433,8 +433,8 @@ def IQ_imbalance(g, phi):
         },
         "cr_cancel_c2t1": {
             "mixInputs": {
-                "I": ("con1", 3),
-                "Q": ("con1", 4),
+                "I": ("con1", 1),
+                "Q": ("con1", 2),
                 "lo_frequency": qubit_LO_q2,
                 "mixer": "mixer_qubit_q2",
             },
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_lf_fem.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_lf_fem.py
index 3162663f8..8bee15c16 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_lf_fem.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_lf_fem.py
@@ -32,8 +32,8 @@ def IQ_imbalance(g, phi):
 ######################
 # Network parameters #
 ######################
-qop_ip = "172.16.33.116"  # Write the QM router IP address
-cluster_name = "Beta_8"  # Write your cluster_name if version >= QOP220
+qop_ip = "127.0.0.1"  # Write the QM router IP address
+cluster_name = None  # Write your cluster_name if version >= QOP220
 qop_port = None  # Write the QOP port if version < QOP220
 octave_config = None
 
@@ -483,8 +483,8 @@ def IQ_imbalance(g, phi):
         },
         "cr_cancel_c1t2": {
             "mixInputs": {
-                "I": (con, fem, 1),
-                "Q": (con, fem, 2),
+                "I": (con, fem, 3),
+                "Q": (con, fem, 4),
                 "lo_frequency": qubit_LO_q1,
                 "mixer": "mixer_qubit_q1",
             },
@@ -497,8 +497,8 @@ def IQ_imbalance(g, phi):
         },
         "cr_cancel_c2t1": {
             "mixInputs": {
-                "I": (con, fem, 3),
-                "Q": (con, fem, 4),
+                "I": (con, fem, 1),
+                "Q": (con, fem, 2),
                 "lo_frequency": qubit_LO_q2,
                 "mixer": "mixer_qubit_q2",
             },
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_lf_fem_and_octave.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_lf_fem_and_octave.py
index 2aa7f813b..ec13bd540 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_lf_fem_and_octave.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_lf_fem_and_octave.py
@@ -33,8 +33,8 @@ def IQ_imbalance(g, phi):
 ######################
 # Network parameters #
 ######################
-qop_ip = "172.16.33.116"  # Write the QM router IP address
-cluster_name = "Beta_8"  # Write your cluster_name if version >= QOP220
+qop_ip = "127.0.0.1"  # Write the QM router IP address
+cluster_name = None  # Write your cluster_name if version >= QOP220
 qop_port = None  # Write the QOP port if version < QOP220
 
 ############################
@@ -467,7 +467,7 @@ def IQ_imbalance(g, phi):
             },
         },
         "cr_cancel_c1t2": {
-            "RF_inputs": {"port": ("octave1", 2)},
+            "RF_inputs": {"port": ("octave1", 3)},
             "intermediate_frequency": cr_cancel_IF_c1t2,  # in Hz
             "operations": {
                 "cw": "const_pulse",
@@ -476,7 +476,7 @@ def IQ_imbalance(g, phi):
             },
         },
         "cr_cancel_c2t1": {
-            "RF_inputs": {"port": ("octave1", 3)},
+            "RF_inputs": {"port": ("octave1", 2)},
             "intermediate_frequency": cr_cancel_IF_c2t1,  # in Hz
             "operations": {
                 "cw": "const_pulse",
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_mw_fem.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_mw_fem.py
index d6650015f..a31279e57 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_mw_fem.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_mw_fem.py
@@ -18,8 +18,8 @@
 ######################
 # Network parameters #
 ######################
-qop_ip = "172.16.33.116"  # Write the QM router IP address
-cluster_name = "Beta_8"  # Write your cluster_name if version >= QOP220
+qop_ip = "127.0.0.1"  # Write the QM router IP address
+cluster_name = None  # Write your cluster_name if version >= QOP220
 qop_port = None  # Write the QOP port if version < QOP220
 octave_config = None
 
diff --git a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_with_octave.py b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_with_octave.py
index 346470270..99e357bde 100644
--- a/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_with_octave.py
+++ b/Quantum-Control-Applications/Superconducting/Two-Fixed-Coupled-Transmons/configuration_with_octave.py
@@ -33,8 +33,8 @@ def IQ_imbalance(g, phi):
 ######################
 # Network parameters #
 ######################
-qop_ip = "172.16.33.101"  # Write the QM router IP address
-cluster_name = "Cluster_81"  # Write your cluster_name if version >= QOP220
+qop_ip = "127.0.0.1"  # Write the QM router IP address
+cluster_name = None  # Write your cluster_name if version >= QOP220
 qop_port = None  # Write the QOP port if version < QOP220
 
 ############################
@@ -399,7 +399,7 @@ def IQ_imbalance(g, phi):
             },
         },
         "cr_cancel_c1t2": {
-            "RF_inputs": {"port": ("octave1", 2)},
+            "RF_inputs": {"port": ("octave1", 3)},
             "intermediate_frequency": cr_cancel_IF_c1t2,  # in Hz
             "operations": {
                 "cw": "const_pulse",
@@ -408,7 +408,7 @@ def IQ_imbalance(g, phi):
             },
         },
         "cr_cancel_c2t1": {
-            "RF_inputs": {"port": ("octave1", 3)},
+            "RF_inputs": {"port": ("octave1", 2)},
             "intermediate_frequency": cr_cancel_IF_c2t1,  # in Hz
             "operations": {
                 "cw": "const_pulse",