diff --git a/script/Alignment/Gun_solenoid_alignment_dv_sim.py b/script/Alignment/Gun_solenoid_alignment_dv_sim.py
index 4462f83..d086dc4 100644
--- a/script/Alignment/Gun_solenoid_alignment_dv_sim.py
+++ b/script/Alignment/Gun_solenoid_alignment_dv_sim.py
@@ -10,16 +10,16 @@
 
 I_set = Channel("SINEG01-MSOL130:I-SET")
 I_read = Channel("SINEG01-MSOL130:I-READ")
-I_comp = Channel("SINEG01-MSOL130:I-COMP")
 # cam_x, cam_y = ...       # some camtool command / channel?
 bpm_x = ai1        # Channel("SINEG01-DBPM340:X1")
 bpm_y = ai2        # Channel("SINEG01-DBPM340:Y1")
 
-def ccr(channel):
+def ccr(mag):
     n = 1
+    I_comp = Channel(mag + ":I-COMP")
     while n > 0:
         sleep(0.2)
-        n = caget(channel)
+        n = I_comp
 
 I1 = 2.0
 I2 = 15.0
@@ -41,11 +41,10 @@ mag = [ "SINEG01-MCRX120",
         "SINEG01-MQUA310",
         "SINEG01-MQUA320" ]
 for m in mag:
-    channel = m + ":I-SET"
-    caput(channel, 0.0)
+    ch = m + ":I-SET"
+    caput(ch, 0.0)
 for m in mag:
-    channel = m + ":I-COMP"
-    ccr(channel)
+    ccr(m)
 
 # Disable laser delay
 # caput("SIN-CVME-TIMAST-TMA:LaserDelayControl", 0)
@@ -53,7 +52,7 @@ for m in mag:
 # Scan using the screen
 #r = lscan(I_set, [I_read, cam_x, cam_y], I1, I2, dI, passes = 2, zigzag = True, before_read = CheckCurrent)
 # Scan using the BPM
-r = lscan(I_set, [I_read, bpm_x, bpm_y], I1, I2, dI)
+r = lscan(I_set, [I_read, bpm_x, bpm_y], I1, I2, dI, before_read = ccr("SINEG01-MSOL130"))
 
 # Enable laser delay
 # caput("SIN-CVME-TIMAST-TMA:LaserDelayControl", 1)
@@ -61,7 +60,7 @@ r = lscan(I_set, [I_read, bpm_x, bpm_y], I1, I2, dI)
 # take the result of the scan and do the plots
 x = r.getReadable(1)
 y = r.getReadable(2)
-plot(y, xdata=x, title = "CM")
+plot(y, xdata=x, title = "Centroid excursion")
 
 # save the entry in the logbook
 msg = str(r)