diff --git a/script/EnergyScan.py b/script/EnergyScan.py
index b1a4cdd..6929354 100644
--- a/script/EnergyScan.py
+++ b/script/EnergyScan.py
@@ -13,16 +13,16 @@ if str(SET_OFFSETS) == "1":
     elif RUNTYPE in ["LH/LV", "LH", "LV"]:
         caput(OTF_MODE1,0)
         caput(OTF_MODE2,0)
-        #wait_channel(OTF_DONE, 1, type = 'i')
+        wait_channel(OTF_DONE, 1, type = 'i')
         caput(OTF_ALPHA1, 0.0)  # LH in ID1
         caput(OTF_ALPHA2, 90.0) # LV in ID2
-        #wait_channel(OTF_DONE, 1, type = 'i') 
+        wait_channel(OTF_DONE, 1, type = 'i') 
     else:
         raise Exception("Invalid run type: " +  RUNTYPE) 
        
     caput(OTF_OFF1,OFFSET1)
     caput(OTF_OFF2,OFFSET2-40) #detune ID2
-    #wait_channel(OTF_DONE, 1, type = 'i')
+    wait_channel(OTF_DONE, 1, type = 'i')
     print "Offsets are set"
     import sys
     sys.exit(0)
@@ -242,7 +242,7 @@ number_of_scans = 1
 if RUNTYPE in ["+/-", "+", "-"]:
     caput(OTF_MODE1,1) # circ + in ID1 
     caput(OTF_MODE2,2) # circ - in ID2
-    #wait_channel(OTF_DONE, 1, type = 'i')
+    wait_channel(OTF_DONE, 1, type = 'i')
     if RUNTYPE == "+/-":
         number_of_scans = 2 * ROUNDS
     else: 
@@ -250,7 +250,7 @@ if RUNTYPE in ["+/-", "+", "-"]:
 elif RUNTYPE in ["LH/LV", "LH", "LV"]:
     caput(OTF_MODE1,0)
     caput(OTF_MODE2,0)
-    #wait_channel(OTF_DONE, 1, type = 'i')
+    wait_channel(OTF_DONE, 1, type = 'i')
     caput(OTF_ALPHA1, 0.0)  # LH in ID1
     caput(OTF_ALPHA2, 90.0) # LV in ID2
     #wait_channel(OTF_DONE, 1, type = 'i')
@@ -268,7 +268,7 @@ elif RUNTYPE in ["+/-", "+", "LH/LV", "LH"]:
     switchpol(1, RUNTYPE) # tune ID1 --> polarization: C+ or LH
 time.sleep(1.0)
 
-#wait_channel(OTF_DONE, 1, type = 'i')
+wait_channel(OTF_DONE, 1, type = 'i')
 
 open_vg10()
 time.sleep(0.5)
diff --git a/script/scan_horizontal_outfocus.xml b/script/scan_horizontal_outfocus.xml
index bd78207..b62c78b 100644
--- a/script/scan_horizontal_outfocus.xml
+++ b/script/scan_horizontal_outfocus.xml
@@ -5,13 +5,13 @@
         <dimension zigzag="false" dataGroup="false">
             <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="RegionPositioner" name="X11MA-VME-ES4:TRY" asynchronous="false" id="horizontal">
                 <region>
-                    <start>10.0</start>
-                    <end>17.0</end>
-                    <stepSize>0.25</stepSize>
+                    <start>9.0</start>
+                    <end>20.0</end>
+                    <stepSize>0.1</stepSize>
                 </region>
             </positioner>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC1" id="TEY"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC2" id="I0"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC1" id="I0"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC2" id="TEY"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ID1:ALPHA" id="polangle"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ID1:MODE" id="polarization"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES3-LSCI:TEMP_RBV" id="temperature"/>
diff --git a/script/scan_vertical.xml b/script/scan_vertical.xml
index c2f08bf..ae340c8 100644
--- a/script/scan_vertical.xml
+++ b/script/scan_vertical.xml
@@ -5,13 +5,13 @@
         <dimension zigzag="false" dataGroup="false">
             <positioner xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="RegionPositioner" name="X11MA-VME-ES4:TRZ" settlingTime="0.5" asynchronous="false" id="vertical">
                 <region>
-                    <start>12.0</start>
-                    <end>23.0</end>
+                    <start>8.0</start>
+                    <end>17.0</end>
                     <stepSize>0.25</stepSize>
                 </region>
             </positioner>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC1" id="ADC1"/>
-            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC2" id="ADC2"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC1" id="I0"/>
+            <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES1:CADC2" id="TEY"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ID1:MODE" id="polarization"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ID1:ALPHA" id="polangle"/>
             <detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScalarDetector" type="Double" name="X11MA-ES3-LSCI:TEMP_RBV" id="temperature"/>
@@ -23,15 +23,15 @@
                 <positions>709.7 700</positions>
             </positioner>
         </dimension>
-        <manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" returnArray="false" id="ADC1_norm">
-            <mapping xsi:type="IDParameterMapping" refid="ADC1" variable="c"/>
-            <mapping xsi:type="IDParameterMapping" refid="ADC2" variable="d"/>
+        <manipulation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ScriptManipulation" returnArray="false" id="norm">
+            <mapping xsi:type="IDParameterMapping" refid="TEY" variable="c"/>
+            <mapping xsi:type="IDParameterMapping" refid="I0" variable="d"/>
             <script>import math
 def process(c,d):
 	return c/d</script>
         </manipulation>
     </scan>
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="ADC1" title="TEY"/>
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="ADC1_norm" title="TEY norm"/>
-    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="ADC2" title="I0"/>
+    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="TEY" title="TEY"/>
+    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="norm" title="TEY norm"/>
+    <visualization xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="LinePlot" x="vertical" y="I0" title="I0"/>
 </configuration>