diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9a58abee..75df67bc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-toml
       - id: debug-statements
   - repo: https://github.com/psf/black
-    rev: 23.10.1
+    rev: 23.11.0
     hooks:
       - id: black
         args:
@@ -25,7 +25,7 @@ repos:
     hooks:
       - id: pyupgrade
   - repo: https://github.com/hadialqattan/pycln
-    rev: v2.3.0
+    rev: v2.4.0
     hooks:
       - id: pycln
         args:
diff --git a/src/qibolab/instruments/qblox/controller.py b/src/qibolab/instruments/qblox/controller.py
index 245bf018..d2e5fc3e 100644
--- a/src/qibolab/instruments/qblox/controller.py
+++ b/src/qibolab/instruments/qblox/controller.py
@@ -216,6 +216,7 @@ class QbloxController(Controller):
         for ro_pulse in sequence.ro_pulses:
             if options.acquisition_type is AcquisitionType.DISCRIMINATION:
                 _res = acquisition_results[ro_pulse.serial][2]
+                _res = _res.reshape(nshots, -1) if options.averaging_mode == AveragingMode.SINGLESHOT else _res
                 if average:
                     _res = np.mean(_res, axis=0)
             else:
diff --git a/src/qibolab/instruments/zhinst.py b/src/qibolab/instruments/zhinst.py
index 7a1df9ac..e8b5c8db 100644
--- a/src/qibolab/instruments/zhinst.py
+++ b/src/qibolab/instruments/zhinst.py
@@ -503,8 +503,13 @@ class Zurich(Controller):
         )
 
     def run_exp(self):
-        """Compilation settings, compilation step, execution step and data retrival"""
-        # self.experiment.save("saved_exp")
+        """
+        Compilation settings, compilation step, execution step and data retrival
+        - Save a experiment Python object:
+        self.experiment.save("saved_exp")
+        - Save a experiment compiled experiment ():
+        self.exp.save("saved_exp")  # saving compiled experiment
+        """
         self.exp = self.session.compile(self.experiment, compiler_settings=COMPILER_SETTINGS)
         # self.exp.save_compiled_experiment("saved_exp")
         self.results = self.session.run(self.exp)
@@ -890,38 +895,18 @@ class Zurich(Controller):
         """qubit readout pulse, data acquisition and qubit relaxation"""
         play_after = None
 
-        if len(self.sequence_qibo.qf_pulses) != 0 and len(self.sequence_qibo.qd_pulses) != 0:
-            play_after = (
-                self.play_after_set(self.sequence_qibo.qf_pulses, "bias")
-                if self.sequence_qibo.qf_pulses.finish > self.sequence_qibo.qd_pulses.finish
-                else self.play_after_set(self.sequence_qibo.qd_pulses, "drive")
-            )
-        if len(self.sequence_qibo.cf_pulses) != 0 and len(self.sequence_qibo.qd_pulses) != 0:
-            play_after = (
-                self.play_after_set(self.sequence_qibo.cf_pulses, "bias_coupler")
-                if self.sequence_qibo.cf_pulses.finish > self.sequence_qibo.qd_pulses.finish
-                else self.play_after_set(self.sequence_qibo.qd_pulses, "drive")
-            )
+        # TODO: if we use duration sweepers, the code might not behave as expected
+        # i.e.: self.sequence_qibo will contain the a pulse or sweeper with a static duration that may screw the comparison
+        qf_finish = self.sequence_qibo.qf_pulses.finish
+        qd_finish = self.sequence_qibo.qd_pulses.finish
+        cf_finish = self.sequence_qibo.cf_pulses.finish
 
-        elif len(self.sequence_qibo.qf_pulses) != 0:
+        if qf_finish > qd_finish and qf_finish > cf_finish:
             play_after = self.play_after_set(self.sequence_qibo.qf_pulses, "bias")
-        elif len(self.sequence_qibo.qd_pulses) != 0:
+        elif qd_finish > qf_finish and qd_finish > cf_finish:
             play_after = self.play_after_set(self.sequence_qibo.qd_pulses, "drive")
-        elif (
-            len(self.sequence_qibo.qf_pulses) != 0
-            and len(self.sequence_qibo.qd_pulses) != 0
-            and len(self.sequence_qibo.cf_pulses) != 0
-        ):
-            seq_qf = self.sequence_qibo.qf_pulses.finish
-            seq_qd = self.sequence_qibo.qd_pulses.finish
-            seq_cf = self.sequence_qibo.cf_pulses.finish
-            # add here for flux coupler pulses
-            if seq_qf > seq_qd and seq_qf > seq_cf:
-                play_after = self.play_after_set(self.sequence_qibo.qf_pulses, "bias")
-            elif seq_qd > seq_qf and seq_qd > seq_cf:
-                play_after = self.play_after_set(self.sequence_qibo.qd_pulses, "drive")
-            elif seq_cf > seq_qf and seq_cf > seq_qd:
-                play_after = self.play_after_set(self.sequence_qibo.cf_pulse, "bias_coupler")
+        elif cf_finish > qf_finish and cf_finish > qd_finish:
+            play_after = self.play_after_set(self.sequence_qibo.cf_pulses, "bias_coupler")
 
         readout_schedule = defaultdict(list)
         qubit_readout_schedule = defaultdict(list)
@@ -946,6 +931,9 @@ class Zurich(Controller):
                 for pulse, q, iq_angle in zip(pulses, qubits, iq_angles):
                     pulse.zhpulse.uid += str(i)
 
+                    # TODO: if the measure sequence starts after the last pulse, add a delay
+                    # keep in mind that the signal might start before the last pulse
+                    # if sweepers are involved
                     if play_after is None:
                         exp.delay(
                             signal=f"measure{q}",
diff --git a/src/qibolab/pulses.py b/src/qibolab/pulses.py
index 90c6c1d6..100bf498 100644
--- a/src/qibolab/pulses.py
+++ b/src/qibolab/pulses.py
@@ -733,7 +733,7 @@ class Pulse:
             value (se_int | int | np.integer): the time in ns.
         """
 
-        if not isinstance(value, (se_int, int, np.integer)):
+        if not isinstance(value, (se_int, int, np.integer, float)):
             raise TypeError(f"start argument type should be intSymbolicExpression or int, got {type(value).__name__}")
         if not value >= 0:
             raise ValueError(f"start argument must be >= 0, got {value}")
@@ -749,7 +749,7 @@ class Pulse:
         else:
             if isinstance(value, np.integer):
                 self._start = int(value)
-            elif isinstance(value, int):
+            else:
                 self._start = value
 
         if not self._duration is None:
@@ -794,7 +794,7 @@ class Pulse:
         else:
             if isinstance(value, np.integer):
                 self._duration = int(value)
-            elif isinstance(value, int):
+            else:
                 self._duration = value
 
         if not self._start is None:

diff --git a/tests/test_pulses.py b/tests/test_pulses.py
index 9c0edb98..b4970f39 100644
--- a/tests/test_pulses.py
+++ b/tests/test_pulses.py
@@ -158,6 +158,23 @@ def test_pulses_pulse_init():
     p11 = FluxPulse(0, 40, 0.9, SNZ(t_half_flux_pulse=17, b_amplitude=0.8), 0, 200)
     p11 = Pulse(0, 40, 0.9, 400e6, 0, eCap(alpha=2), 0, PulseType.DRIVE)
 
+    # initialisation with float duration and start
+    p12 = Pulse(
+        start=5.5,
+        duration=34.33,
+        amplitude=0.9,
+        frequency=20_000_000,
+        relative_phase=1,
+        shape=Rectangular(),
+        channel=0,
+        type=PulseType.READOUT,
+        qubit=0,
+    )
+    assert repr(p12) == "Pulse(5.5, 34.33, 0.9, 20_000_000, 1, Rectangular(), 0, PulseType.READOUT, 0)"
+    assert isinstance(p12.start, float)
+    assert isinstance(p12.duration, float)
+    assert p12.finish == 5.5 + 34.33
+
 
 def test_pulses_pulse_attributes():
     channel = 0
@@ -1152,9 +1169,9 @@ def test_pulse_properties(start, duration):
     check_properties(p0)
 
 
-@pytest.mark.parametrize("faulty_start", [10.0, "hello"])
-@pytest.mark.parametrize("faulty_duration", [100.0, "hello"])
-def test_pulse_setter_errors(faulty_start, faulty_duration):
+def test_pulse_setter_errors():
+    faulty_duration = "hello"
+    faulty_start = "hello"
     with pytest.raises(TypeError):
         p0 = Pulse(faulty_start, 100, 0.9, 0, 0, Rectangular(), 0)
     with pytest.raises(TypeError):

Bugs when sweeping drive pulses parameters in qblox driver  with `AveragingMode.SINGLESHOT`
I found two bugs while running new protocols developed in https://github.com/qiboteam/qibocal/pull/567:

1. `rabi_amplitude`


The error triggered is the following

```sh
RecursionError: maximum recursion depth exceeded in comparison
```

2. `rabi_length`

Here is an example of a runcard:
```yml

platform: qw5q_gold_qblox

qubits: [0,1,2,3,4]

actions:

  - id: rabi
    priority: 0
    operation: rabi_length
    parameters:
      pulse_duration_start: 10
      pulse_duration_end: 200
      pulse_duration_step: 4
      pulse_amplitude: 0.5
      relaxation_time: 100_000
      nshots: 1024
```
In this case I see a single value in the plot:

![image](https://github.com/qiboteam/qibolab/assets/49183315/3123ece7-245e-41ec-b391-83fa327c4f22)

tests/test_pulses.py::test_pulses_pulse_init
tests/test_pulses.py::test_pulses_pulse_attributes tests/test_pulses.py::test_pulses_is_equal_ignoring_start tests/test_pulses.py::test_pulses_pulse_serial tests/test_pulses.py::test_pulses_pulseshape_sampling_rate tests/test_pulses.py::test_raise_shapeiniterror tests/test_pulses.py::test_pulses_pulseshape_drag_shape tests/test_pulses.py::test_pulses_pulse_hash tests/test_pulses.py::test_pulses_pulse_aliases tests/test_pulses.py::test_pulses_pulse_split_pulse tests/test_pulses.py::test_pulses_pulsesequence_init tests/test_pulses.py::test_pulses_pulsesequence_operators tests/test_pulses.py::test_pulses_pulsesequence_add tests/test_pulses.py::test_pulses_pulsesequence_clear tests/test_pulses.py::test_pulses_pulsesequence_start_finish tests/test_pulses.py::test_pulses_pulsesequence_get_channel_pulses tests/test_pulses.py::test_pulses_pulsesequence_get_qubit_pulses tests/test_pulses.py::test_pulses_pulsesequence_pulses_overlap tests/test_pulses.py::test_pulses_pulsesequence_separate_overlapping_pulses tests/test_pulses.py::test_pulses_pulse_symbolic_expressions tests/test_pulses.py::test_pulses_pulse_pulse_order tests/test_pulses.py::test_pulses_waveform tests/test_pulses.py::test_pulses_pulseshape_rectangular tests/test_pulses.py::test_pulses_pulseshape_gaussian tests/test_pulses.py::test_pulses_pulseshape_drag tests/test_pulses.py::test_pulses_pulseshape_eq tests/test_pulses.py::test_pulse tests/test_pulses.py::test_readout_pulse tests/test_pulses.py::test_pulse_sequence_add tests/test_pulses.py::test_pulse_sequence__add__ tests/test_pulses.py::test_pulse_sequence__mul__ tests/test_pulses.py::test_pulse_sequence_add_readout tests/test_pulses.py::test_envelope_waveform_i_q tests/test_pulses.py::test_pulse_properties[100-0] tests/test_pulses.py::test_pulse_properties[100-10] tests/test_pulses.py::test_pulse_properties[100-start2] tests/test_pulses.py::test_pulse_properties[100-start3] tests/test_pulses.py::test_pulse_properties[500-0] tests/test_pulses.py::test_pulse_properties[500-10] tests/test_pulses.py::test_pulse_properties[500-start2] tests/test_pulses.py::test_pulse_properties[500-start3] tests/test_pulses.py::test_pulse_properties[duration2-0] tests/test_pulses.py::test_pulse_properties[duration2-10] tests/test_pulses.py::test_pulse_properties[duration2-start2] tests/test_pulses.py::test_pulse_properties[duration2-start3] tests/test_pulses.py::test_pulse_properties[duration3-0] tests/test_pulses.py::test_pulse_properties[duration3-10] tests/test_pulses.py::test_pulse_properties[duration3-start2] tests/test_pulses.py::test_pulse_properties[duration3-start3] tests/test_pulses.py::test_pulse_setter_errors