diff --git a/config/devices.properties b/config/devices.properties
index dfb0c6d..8925319 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -3,9 +3,9 @@ data=ch.psi.pshell.epics.ChannelDoubleArray|DATA 3|Read||
 edata=ch.psi.pshell.epics.ChannelDoubleArray|EDATA 3|Read||
 idata=ch.psi.pshell.epics.ChannelDoubleArray|IDATA 3|Read||
 fdata=ch.psi.pshell.epics.ChannelDoubleArray|FDATA 3|Read||
-field_x=ch.psi.pshell.epics.ChannelDouble|X07MA-PC-PS2:M:GO.A|||
+field_x=ch.psi.pshell.epics.ControlledVariable|X07MA-PC-PS2:M:GO.A X07MA-PC-PS2:STS:PMCURRENT|||
 field_x_done=ch.psi.pshell.epics.ChannelInteger|X07MA-PC-MAG:X:RAMP:DONE|Read||
-field_z=ch.psi.pshell.epics.ChannelDouble|X07MA-PC-PS1:M:GO.A|||
+field_z=ch.psi.pshell.epics.ControlledVariable|X07MA-PC-PS1:M:GO.A X07MA-PC-PS1:STS:PMCURRENT|||
 field_z_done=ch.psi.pshell.epics.ChannelInteger|X07MA-PC-MAG:Z:RAMP:DONE|Read||
 pol_mode=ch.psi.pshell.epics.DiscretePositioner|X07MA-ID:MODE|||
 pol_offset=ch.psi.pshell.epics.ChannelDouble|X07MA-ID:ENERGY-OFFS|||
diff --git a/script/local.py b/script/local.py
index 167c6c0..8a104cd 100644
--- a/script/local.py
+++ b/script/local.py
@@ -76,23 +76,23 @@ def setHz(field, timeout = -1):
     field_z.write(field)
     field_z_done.waitValue(1,timeout)
 
-def set_pol_cplus(off = None, timeout = -1):
+def set_pol_cplus(offset = None, timeout = -1):
     pol_mode.write("CIRC +")
     if off is not None:
-        offset.write(off)
+        pol_offset.write(offset)
     pol_done.waitValue("DONE",timeout)
 
-def set_pol_cminus(off = None, timeout = -1):
+def set_pol_cminus(offset = None, timeout = -1):
     pol_mode.write("CIRC -")
     if off is not None:
-        offset.write(off)
+        pol_offset.write(offset)
     pol_done.waitValue("DONE",timeout)
 
-def set_pol_lin(angle, off = None, timeout = -1):
+def set_pol_lin(angle, offset = None, timeout = -1):
     pol_mode.write("LINEAR")
-    alpha.write(angle)
+    pol_angle.write(angle)
     if off is not None:
-        offset.write(off)
+        pol_offset.write(offset)
     pol_done.waitValue("DONE",timeout)