diff --git a/config/devices.properties b/config/devices.properties
index c045441e..200c627b 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,5 +1,3 @@
-Keithley1=ch.psi.pshell.epics.ChannelDouble|X03DA-KEITHLEY-1:READOUT|Read||true
-Keithley2=ch.psi.pshell.epics.ChannelDouble|X03DA-KEITHLEY-2:READOUT|Read||true
 #det=ch.psi.pshell.epics.AreaDetector|X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1|||
 Scienta=ch.psi.pshell.epics.Scienta|X03DA-SCIENTA|||true
 Manip=ch.psi.pshell.epics.Manipulator||||true
diff --git a/config/variables.properties b/config/variables.properties
index 0b05042a..2e7d4691 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,4 +1,4 @@
-#Mon Nov 15 14:42:24 CET 2021
+#Mon Nov 15 15:24:52 CET 2021
 LastRunDate=211115
-FileSequentialNumber=10006
-DaySequentialNumber=5
+FileSequentialNumber=10016
+DaySequentialNumber=15
diff --git a/script/XAS.py b/script/XAS.py
index 0ee4548c..f32706ea 100644
--- a/script/XAS.py
+++ b/script/XAS.py
@@ -3,7 +3,6 @@ XAS scan
 """
 
 POSITIONERS = (Eph)
-# SENSORS = (Keithley1, Keithley2, MachineCurrent)
 
 av_sample = create_averager(SampleCurrent, 20, interval=-1.0, name="AvgSampleCurrent")
 av_ref = create_averager(RefCurrent, 20, interval=-1.0, name="AvgRefCurrent")
diff --git a/script/attic/XASAziScan.py b/script/attic/XASAziScan.py
index e42c9c1b..6cae3be5 100644
--- a/script/attic/XASAziScan.py
+++ b/script/attic/XASAziScan.py
@@ -3,7 +3,7 @@ XAS scan
 """
 
 POSITIONERS = (ManipulatorPhi)
-SENSORS = (Keithley1, Keithley2, MachineCurrent)
+SENSORS = (SampleCurrent, RefCurrent, MachineCurrent)
 
 #SENSORS = (SampleCurrent, RefCurrent, AuxCurrent, AuxVoltage, MachineCurrent)
 #SENSORS = (SampleCurrent, RefCurrent, AuxCurrent, MachineCurrent, OpticsCameraCentroidX, OpticsCameraSigmaX)
diff --git a/script/otf.py b/script/otf.py
index e47d112c..99296930 100644
--- a/script/otf.py
+++ b/script/otf.py
@@ -20,11 +20,11 @@ else:
     
 
 wait_beam()
-sensors = MonoEnergy, MonoBeta, MonoTheta, Keithley1, Keithley2
+sensors = SampleCurrent, RefCurrent, MonoBeta, MonoTheta, MonoEnergy
 
 #dev_run='ca://X03DA-OTF:RUN?monitored=true&type=d'
 #dev_sts='ca://X03DA-OTF:STATUS?monitored=true&type=d'
-#sensors = dev_run,dev_sts, MonoEnergy, MonoBeta, MonoTheta, Keithley1, Keithley2
+#sensors = dev_run,dev_sts, MonoEnergy, MonoBeta, MonoTheta, SampleCurrent, RefCurrent
 
 caput('X03DA-OTF:TIME', TIME)
 caput('X03DA-OTF:MODE', MODE)
@@ -100,7 +100,7 @@ try:
         if MODE=="ANGLE":
             mscan(MonoBeta, sensors, -1, None, range="auto", take_initial=False, after_read=after_read)
         else:
-            mscan(MonoEnergy, sensors, -1, None, range="auto", take_initial=False, after_read=after_read, domain_axis="MonoEnergy" )
+            mscan(SampleCurrent, sensors, -1, None, range="auto", take_initial=False, after_read=after_read, domain_axis="MonoEnergy" )
     finally:        
         ret[0].cancel(True)