diff --git a/pxii_bec/bec_ipython_client/startup/post_startup.py b/pxii_bec/bec_ipython_client/startup/post_startup.py
index bd2dab1..e209b0f 100644
--- a/pxii_bec/bec_ipython_client/startup/post_startup.py
+++ b/pxii_bec/bec_ipython_client/startup/post_startup.py
@@ -34,4 +34,8 @@ to setup the prompts.
 """
 
 # pylint: disable=invalid-name, unused-import, import-error, undefined-variable, unused-variable, unused-argument, no-name-in-module
-init_positioned_devices()
+d = init_se_devices()
+states, allow_modifiers = get_states()
+deps = planner_deps()
+planner = StateManager(d, states, allow_modifiers, deps)
+
diff --git a/pxii_bec/device_configs/beamline_states.yaml b/pxii_bec/device_configs/beamline_states.yaml
index 8015eab..e9638bc 100644
--- a/pxii_bec/device_configs/beamline_states.yaml
+++ b/pxii_bec/device_configs/beamline_states.yaml
@@ -2,7 +2,7 @@ states:
   robot_sample_exchange:
     allow_modifiers: true
     bl_pos: in
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: safe
     coll_y: out
@@ -32,7 +32,7 @@ states:
   data_collection:
     allow_modifiers: true
     bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: safe
     coll_y: in
@@ -47,7 +47,7 @@ states:
   DC_XRF:
     allow_modifiers: true
 #    bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: safe
     coll_y: in
@@ -62,7 +62,7 @@ states:
   manual_sample_exchange:
     allow_modifiers: true
     bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: out
     bs_z: safe
     coll_y: park
@@ -76,7 +76,7 @@ states:
 
   beam_visualisation:
     bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: safe
     coll_y: out
@@ -90,7 +90,7 @@ states:
 
   flux_measurement:
     bl_pos: in
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: safe
     coll_y: out
@@ -104,7 +104,7 @@ states:
 
   beamstop_alignment:
     bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: in
     bs_z: samp
     coll_y: out
@@ -119,7 +119,7 @@ states:
   maintenance:
     allow_modifiers: true
     bl_pos: out
-    bl_bright: 'off'
+    bl_bright: 'on'
     bs_pos: out
     bs_z: safe
     coll_y: park
@@ -137,7 +137,7 @@ states:
     bl_bright: 'on'
     bs_pos: in
     bs_z: safe
-    coll_y: intermediate
+    coll_y: in #intermediate
     cryo_pos: in
     det_cov: 'close'
     diag_y: out
diff --git a/pxii_bec/device_configs/pxii-devices-new.csv b/pxii_bec/device_configs/pxii-devices-new.csv
index 105a458..6e81264 100644
--- a/pxii_bec/device_configs/pxii-devices-new.csv
+++ b/pxii_bec/device_configs/pxii-devices-new.csv
@@ -87,30 +87,30 @@ ss_xicam_exp,ss camera exposure,Signal,X10SA-ES-SSXI:cam1:AcquireTime,baseline,s
 ss_xicam_gain,ss camera gain,Signal,X10SA-ES-SSXI:cam1:cam1:Gain,baseline,ss,no,no,,
 ss_xicam_xsig,ss camera  x sigma,Signal,X10SA-ES-SSXI:cam1:Stats5:SigmaX_RBV,baseline,ss,yes,no,,
 ss_xicam_ysig,ss camera y sigma,Signal,X10SA-ES-SSXI:cam1:Stats5:SigmaY_RBV,baseline,ss,yes,no,,
-vfm_xu,VFM Upstream X,MotorEC,X10SA-ES-KBV:TRXU,baseline,vfm,no,no,,
-vfm_xd,VFM Downstream X,MotorEC,X10SA-ES-KBV:TRXD,baseline,vfm,no,no,,
-vfm_yur,VFM Upstream Ring Y,MotorEC,X10SA-ES-KBV:TRYUR,baseline,vfm,no,no,,
-vfm_yw,VFM Wall Y,MotorEC,X10SA-ES-KBV:TRYW,baseline,vfm,no,no,,
-vfm_ydr,VFM Downstream Ring Y,MotorEC,X10SA-ES-KBV:TRYDR,baseline,vfm,no,no,,
-vfm_bu,VFM Upstream Bender,MotorEC,X10SA-ES-KBV:BNDU,baseline,vfm,no,no,,
-vfm_bd,VFM Downstream Bender,MotorEC,X10SA-ES-KBV:BNDD,baseline,vfm,no,no,,
-vfm_yaw,VFM Virtual Yaw,MotorEC,X10SA-ES-KBV:YAW,baseline,vfm,no,no,,
-vfm_roll,VFM Virtual Roll,MotorEC,X10SA-ES-KBV:ROLL,baseline,vfm,no,no,,
-vfm_pitch,VFM Virtual Pitch,MotorEC,X10SA-ES-KBV:PITCH,baseline,vfm,no,no,,
-vfm_x,VFM Virtual X,MotorEC,X10SA-ES-KBV:TRX,baseline,vfm,no,no,,
-vfm_y,VFM Virtual Y ,MotorEC,X10SA-ES-KBV:TRY,baseline,vfm,no,no,,
-hfm_xu,HFM Upstream X,MotorEC,X10SA-ES-KBH:TRXU,baseline,hfm,no,no,,
-hfm_xd,HFM Downstream X,MotorEC,X10SA-ES-KBH:TRXD,baseline,hfm,no,no,,
-hfm_yuw,HFM Upstream Wall Y,MotorEC,X10SA-ES-KBH:TRYUW,baseline,hfm,no,no,,
-hfm_yr,HFM Ring Y,MotorEC,X10SA-ES-KBH:TRYR,baseline,hfm,no,no,,
-hfm_ydw,HFM Downstream Wall Y,MotorEC,X10SA-ES-KBH:TRYDW,baseline,hfm,no,no,,
-hfm_bu,HFM Upstream Bender,MotorEC,X10SA-ES-KBH:BNDU,baseline,hfm,no,no,,
-hfm_bd,HFM Downstream Bender,MotorEC,X10SA-ES-KBH:BNDD,baseline,hfm,no,no,,
-hfm_yaw,HFM Virtual Yaw,MotorEC,X10SA-ES-KBH:YAW,baseline,hfm,no,no,,
-hfm_roll,HFM Virtual Roll,MotorEC,X10SA-ES-KBH:ROLL,baseline,hfm,no,no,,
-hfm_pitch,HFM Virtual Pitch,MotorEC,X10SA-ES-KBH:PITCH,baseline,hfm,no,no,,
-hfm_x,HFM Virtual X,MotorEC,X10SA-ES-KBH:TRX,baseline,hfm,no,no,,
-hfm_y,HFM Virtual Y ,MotorEC,X10SA-ES-KBH:TRY,baseline,hfm,no,no,,
+vfm_xu,VFM Upstream X,MotorEC,X10SA-ES-VFM:TRXU,baseline,vfm,no,yes,,
+vfm_xd,VFM Downstream X,MotorEC,X10SA-ES-VFM:TRXD,baseline,vfm,no,yes,,
+vfm_yur,VFM Upstream Ring Y,MotorEC,X10SA-ES-VFM:TRYUR,baseline,vfm,no,yes,,
+vfm_yw,VFM Wall Y,MotorEC,X10SA-ES-VFM:TRYW,baseline,vfm,no,yes,,
+vfm_ydr,VFM Downstream Ring Y,MotorEC,X10SA-ES-VFM:TRYDR,baseline,vfm,no,yes,,
+vfm_bu,VFM Upstream Bender,MotorEC,X10SA-ES-VFM:BNDU,baseline,vfm,no,yes,,
+vfm_bd,VFM Downstream Bender,MotorEC,X10SA-ES-VFM:BNDD,baseline,vfm,no,yes,,
+vfm_yaw,VFM Virtual Yaw,MotorEC,X10SA-ES-VFM:YAW,baseline,vfm,no,yes,,
+vfm_roll,VFM Virtual Roll,MotorEC,X10SA-ES-VFM:ROLL,baseline,vfm,no,yes,,
+vfm_pitch,VFM Virtual Pitch,MotorEC,X10SA-ES-VFM:PITCH,baseline,vfm,no,yes,,
+vfm_x,VFM Virtual X,MotorEC,X10SA-ES-VFM:TRX,baseline,vfm,no,yes,,
+vfm_y,VFM Virtual Y ,MotorEC,X10SA-ES-VFM:TRY,baseline,vfm,no,yes,,
+hfm_xu,HFM Upstream X,MotorEC,X10SA-ES-HFM:TRXU,baseline,hfm,no,yes,,
+hfm_xd,HFM Downstream X,MotorEC,X10SA-ES-HFM:TRXD,baseline,hfm,no,yes,,
+hfm_yuw,HFM Upstream Wall Y,MotorEC,X10SA-ES-HFM:TRYUW,baseline,hfm,no,yes,,
+hfm_yr,HFM Ring Y,MotorEC,X10SA-ES-HFM:TRYR,baseline,hfm,no,yes,,
+hfm_ydw,HFM Downstream Wall Y,MotorEC,X10SA-ES-HFM:TRYDW,baseline,hfm,no,yes,,
+hfm_bu,HFM Upstream Bender,MotorEC,X10SA-ES-HFM:BNDU,baseline,hfm,no,yes,,
+hfm_bd,HFM Downstream Bender,MotorEC,X10SA-ES-HFM:BNDD,baseline,hfm,no,yes,,
+hfm_yaw,HFM Virtual Yaw,MotorEC,X10SA-ES-HFM:YAW,baseline,hfm,no,yes,,
+hfm_roll,HFM Virtual Roll,MotorEC,X10SA-ES-HFM:ROLL,baseline,hfm,no,yes,,
+hfm_pitch,HFM Virtual Pitch,MotorEC,X10SA-ES-HFM:PITCH,baseline,hfm,no,yes,,
+hfm_x,HFM Virtual X,MotorEC,X10SA-ES-HFM:TRX,baseline,hfm,no,yes,,
+hfm_y,HFM Virtual Y ,MotorEC,X10SA-ES-HFM:TRY,baseline,hfm,no,yes,,
 bcu_bpm1,BCU BPM Signal 1 ,SignalRO,X10SA-ES-BCBPM:Current1:MeanValue_RBV,monitored,bpm,yes,yes,,
 bcu_bpm2,BCU BPM Signal 2,SignalRO,X10SA-ES-BCBPM:Current2:MeanValue_RBV,monitored,bpm,yes,yes,,
 bcu_bpm3,BCU BPM Signal 3,SignalRO,X10SA-ES-BCBPM:Current3:MeanValue_RBV,monitored,bpm,yes,yes,,
@@ -118,14 +118,14 @@ bcu_bpm4,BCU BPM Signal 4,SignalRO,X10SA-ES-BCBPM:Current4:MeanValue_RBV,monitor
 bcu_bpmsum,BCU BPM Summed,SignalRO,X10SA-ES-BCBPM:SumAll:MeanValue_RBV,monitored,bpm,yes,yes,,
 bcu_bpm_x,BCU BPM X,Motor,X10SA-ES-BCBPM:TRX,baseline,bcu,no,yes,,
 bcu_bpm_y,BCU BPM Y ,Motor,X10SA-ES-BCBPM:TRY,baseline,bcu,no,yes,,
-bcu_sl_xw,BCU slit wall,Motor,X10SA-ES-BCSLH:TRXW,baseline,bcu,no,no,,
-bcu_sl_xr,BCU slit ring,Motor,X10SA-ES-BCSLH:TRXR,baseline,bcu,no,no,,
-bcu_sl_xcen,BCU slit X centre,Motor,X10SA-ES-BCSLH:CENTER,baseline,bcu,no,no,,
-bcu_sl_xsize,BCU slit X size,Motor,X10SA-ES-BCSLH:SIZEX,baseline,bcu,no,no,,
-bcu_sl_yt,BCU slit top,Motor,X10SA-ES-BCSLV:TRYT,baseline,bcu,no,no,,
-bcu_sl_yb,BCU slit bottom,Motor,X10SA-ES-BCSLV:TRYB,baseline,bcu,no,no,,
-bcu_sl_ycen,BCU slit Y centre,Motor,X10SA-ES-BCSLV:CENTER,baseline,bcu,no,no,,
-bcu_sl_ysize,BCU slit Y size,Motor,X10SA-ES-BCSLV:SIZE,baseline,bcu,no,no,,
+bcu_sl_xw,BCU slit wall,Motor,X10SA-ES-BCSLH:TRXW,baseline,bcu,no,yes,,
+bcu_sl_xr,BCU slit ring,Motor,X10SA-ES-BCSLH:TRXR,baseline,bcu,no,yes,,
+bcu_sl_xcen,BCU slit X centre,Motor,X10SA-ES-BCSLH:CENTER,baseline,bcu,no,yes,,
+bcu_sl_xsize,BCU slit X size,Motor,X10SA-ES-BCSLH:SIZE,baseline,bcu,no,yes,,
+bcu_sl_yt,BCU slit top,Motor,X10SA-ES-BCSLV:TRYT,baseline,bcu,no,yes,,
+bcu_sl_yb,BCU slit bottom,Motor,X10SA-ES-BCSLV:TRYB,baseline,bcu,no,yes,,
+bcu_sl_ycen,BCU slit Y centre,Motor,X10SA-ES-BCSLV:CENTER,baseline,bcu,no,yes,,
+bcu_sl_ysize,BCU slit Y size,Motor,X10SA-ES-BCSLV:SIZE,baseline,bcu,no,yes,,
 xrf_pos,XRF det in/out,Signal,X10SA-ES-XRF:POS-SET,baseline,se,no,no,"{""type"":positioner}",
 samcam_x,sample cam X ,SignalRO,X10SA-ES-MS:Stats5:CentroidX_RBV,baseline,scam,yes,yes,,
 samcam_xsig,sample cam X sigma,SignalRO,X10SA-ES-MS:Stats5:SigmaX_RBV,monitored,scam,yes,yes,,
@@ -153,6 +153,7 @@ gon_z,Goniometer X,Motor,X10SA-ES-DF1:TRZ1,baseline,det,no,yes,,
 omega,Omega,Motor,X10SA-ES-DF1:ROTU,baseline,det,no,yes,,
 cryo_pos,Cryo positioner,Signal,X10SA-ES-CS:POS-SET,baseline,se,no,no,"{""type"":positioner}",
 cryo_x,Cryojet X ,Motor,X10SA-ES-CS:TRX,baseline,se,no,yes,,
+cryo_temp,Cryojet temperature,Signal,X10SA-ES-CS:TEMP_RBV,baseline,se,no,yes,,
 det_xi_focus,X-ray eye 2 Focus,Motor,X10SA-ES-XEYE:FOCUS,baseline,det,no,yes,,
 det_xi_zoom,X-ray eye 2 Zoom,Motor,X10SA-ES-XEYE:ZOOM,baseline,det,no,yes,,
 det_xi_x,X-ray eye X,Motor,X10SA-ES-XEYE:TRX,baseline,det,no,yes,,
diff --git a/pxii_bec/device_configs/pxii-devices-new.yaml b/pxii_bec/device_configs/pxii-devices-new.yaml
index e3d02f4..be99347 100644
--- a/pxii_bec/device_configs/pxii-devices-new.yaml
+++ b/pxii_bec/device_configs/pxii-devices-new.yaml
@@ -863,6 +863,294 @@ ss_xi_y:
   readOnly: False
   softwareTrigger: false
 
+vfm_xu:
+  description: VFM Upstream X
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRXU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_xd:
+  description: VFM Downstream X
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRXD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_yur:
+  description: VFM Upstream Ring Y
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYUR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_yw:
+  description: VFM Wall Y
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_ydr:
+  description: VFM Downstream Ring Y
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYDR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_bu:
+  description: VFM Upstream Bender
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:BNDU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_bd:
+  description: VFM Downstream Bender
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:BNDD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_yaw:
+  description: VFM Virtual Yaw
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:YAW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_roll:
+  description: VFM Virtual Roll
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:ROLL'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_pitch:
+  description: VFM Virtual Pitch
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:PITCH'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_x:
+  description: VFM Virtual X
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+vfm_y:
+  description: VFM Virtual Y 
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-VFM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - vfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_xu:
+  description: HFM Upstream X
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRXU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_xd:
+  description: HFM Downstream X
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRXD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_yuw:
+  description: HFM Upstream Wall Y
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYUW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_yr:
+  description: HFM Ring Y
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_ydw:
+  description: HFM Downstream Wall Y
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYDW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_bu:
+  description: HFM Upstream Bender
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:BNDU'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_bd:
+  description: HFM Downstream Bender
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:BNDD'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_yaw:
+  description: HFM Virtual Yaw
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:YAW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_roll:
+  description: HFM Virtual Roll
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:ROLL'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_pitch:
+  description: HFM Virtual Pitch
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:PITCH'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_x:
+  description: HFM Virtual X
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
+hfm_y:
+  description: HFM Virtual Y 
+  deviceClass: ophyd_devices.EpicsMotorEC
+  deviceConfig: {prefix: 'X10SA-ES-HFM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - hfm
+  readOnly: False
+  softwareTrigger: false
+
 bcu_bpm1:
   description: BCU BPM Signal 1 
   deviceClass: ophyd.EpicsSignalRO
@@ -947,6 +1235,102 @@ bcu_bpm_y:
   readOnly: False
   softwareTrigger: false
 
+bcu_sl_xw:
+  description: BCU slit wall
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLH:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_xr:
+  description: BCU slit ring
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLH:TRXR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_xcen:
+  description: BCU slit X centre
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLH:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_xsize:
+  description: BCU slit X size
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLH:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_yt:
+  description: BCU slit top
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLV:TRYT'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_yb:
+  description: BCU slit bottom
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLV:TRYB'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_ycen:
+  description: BCU slit Y centre
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLV:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
+bcu_sl_ysize:
+  description: BCU slit Y size
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-BCSLV:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: False
+  softwareTrigger: false
+
 samcam_x:
   description: sample cam X 
   deviceClass: ophyd.EpicsSignalRO
@@ -1151,6 +1535,18 @@ cryo_x:
   readOnly: False
   softwareTrigger: false
 
+cryo_temp:
+  description: Cryojet temperature
+  deviceClass: ophyd.EpicsSignal
+  deviceConfig: {read_pv: 'X10SA-ES-CS:TEMP_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  readOnly: False
+  softwareTrigger: false
+
 det_xi_focus:
   description: X-ray eye 2 Focus
   deviceClass: ophyd_devices.EpicsMotor
diff --git a/pxii_bec/device_configs/se_devices.yaml b/pxii_bec/device_configs/se_devices.yaml
index e2f0a36..254d9a6 100644
--- a/pxii_bec/device_configs/se_devices.yaml
+++ b/pxii_bec/device_configs/se_devices.yaml
@@ -1,6 +1,6 @@
 ss_sl_xw:
   description: SS slit wall
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSLH:TRXW'}
   onFailure: buffer
   enabled: True
@@ -16,7 +16,7 @@ ss_sl_xw:
 
 bs_z:
   description: Beamstop Z
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-BS:TRZ'}
   onFailure: buffer
   enabled: True
@@ -36,7 +36,7 @@ bs_z:
 
 gon_x:
   description: Goniometer X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-DF1:TRX1'}
   onFailure: buffer
   enabled: True
@@ -54,7 +54,7 @@ gon_x:
 
 diag_y:
   description: Scintillator/diode Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SCL:TRY'}
   onFailure: buffer
   enabled: True
@@ -73,7 +73,7 @@ diag_y:
 
 coll_y:
   description: Collimator Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-COL:TRY'}
   onFailure: buffer
   enabled: True
diff --git a/pxii_bec/macros/check.py b/pxii_bec/macros/check.py
new file mode 100644
index 0000000..66af021
--- /dev/null
+++ b/pxii_bec/macros/check.py
@@ -0,0 +1,62 @@
+from bec_lib.device import Signal, Positioner
+
+def check():
+    check_devices(tolerance = 0.02)
+
+    
+
+def check_devices(tolerance):
+    devices = list(dev.items())
+    for name, obj in devices:
+
+        try:
+            data = obj.read()
+            # deal with smargon
+            if "smargon" in name:
+                continue
+            
+            actual = data[name]["value"]
+
+            # If signal and a camera or bpm, check reading is not 0
+            if isinstance(obj, Signal):
+                if 'cam' in name or 'bpm' in name:
+                    if actual == 0.0:
+                        print(f"{name} is reading 0")    
+
+            # if signal is a motor, check in position, error, moving
+            if isinstance(obj, Positioner):
+                # Check set position = real position
+
+                sp_key = f"{name}_user_setpoint"
+
+                if sp_key not in data:
+                    continue
+
+                setpoint = data[sp_key]["value"]
+
+                diff = abs(actual - setpoint)
+                inpos = diff <= tolerance
+                if not inpos:
+                    print(
+                        f"{name}: "
+                        # f"actual={actual:.4f}, "
+                        # f"setpoint={setpoint:.4f}, "
+                        # f"diff={diff:.4f}, "
+                        f"in position = {inpos}"
+                    )
+                # check if motor is in error state    
+                error_status = obj.motor_status.get()
+
+                if error_status != 0:
+                    print(f"{name}: error_state = {error_status}")
+                
+                # check if motor is moving
+                move_status = obj.motor_is_moving.get()
+                if move_status != 0:
+                    print(f"{name} is moving")
+
+        
+        except Exception as exc:
+
+            print(f"{name}: ERROR -> {exc}")   
+
diff --git a/pxii_bec/macros/policies.py b/pxii_bec/macros/policies.py
index 1791e8a..34f7790 100644
--- a/pxii_bec/macros/policies.py
+++ b/pxii_bec/macros/policies.py
@@ -54,7 +54,7 @@ def make_diag_y_policy(d):
     def diag_y_policy(target):
         cfg = d["diag_y"].positions
         # Don't move in if the goniometer is >= 'in'
-        if d["gon_x"].actual >= d["gon_x"].positions["in"]:
+        if d["gon_x"].actual >= d["gon_x"].positions["in"] and target > cfg['out']:
             raise GuardViolation(
                 f"Diagnostic device cannot move beyond {cfg['out']} mm when goniometer is not OUT"
             )
diff --git a/pxii_bec/device_configs/pxii-autogenerated.yaml b/pxii_bec/macros/pxii-devices-new.yaml
similarity index 69%
rename from pxii_bec/device_configs/pxii-autogenerated.yaml
rename to pxii_bec/macros/pxii-devices-new.yaml
index c56b82c..2f2530d 100644
--- a/pxii_bec/device_configs/pxii-autogenerated.yaml
+++ b/pxii_bec/macros/pxii-devices-new.yaml
@@ -72,7 +72,7 @@ fe_bpmsum:
 
 fe_bpm_x:
   description: FE BPM X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-XBPM1:TRX'}
   onFailure: buffer
   enabled: True
@@ -84,7 +84,7 @@ fe_bpm_x:
 
 fe_bpm_y:
   description: FE BPM Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-XBPM1:TRY'}
   onFailure: buffer
   enabled: True
@@ -96,7 +96,7 @@ fe_bpm_y:
 
 fe_sl_xr:
   description: FE Slit X Ring
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-FE-SL1:TRXR'}
   onFailure: buffer
   enabled: True
@@ -108,7 +108,7 @@ fe_sl_xr:
 
 fe_sl_yt:
   description: FE Slit Y top
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-FE-SL1:TRYT'}
   onFailure: buffer
   enabled: True
@@ -120,7 +120,7 @@ fe_sl_yt:
 
 fe_sl_xw:
   description: FE Slit X Wall
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-FE-SL1:TRXW'}
   onFailure: buffer
   enabled: True
@@ -132,7 +132,7 @@ fe_sl_xw:
 
 fe_sl_yb:
   description: FE SlitY Bottom
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-FE-SL1:TRYB'}
   onFailure: buffer
   enabled: True
@@ -144,7 +144,7 @@ fe_sl_yb:
 
 fe_sl_xcen:
   description: FE Slit X Centre
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-FE-SL1:CENTERX'}
   onFailure: buffer
   enabled: True
@@ -156,7 +156,7 @@ fe_sl_xcen:
 
 fe_sl_xsize:
   description: FE Slit X Size
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-FE-SL1:SIZEX'}
   onFailure: buffer
   enabled: True
@@ -168,7 +168,7 @@ fe_sl_xsize:
 
 fe_sl_ycen:
   description: FE Slit Y Centre
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-FE-SL1:CENTERY'}
   onFailure: buffer
   enabled: True
@@ -180,7 +180,7 @@ fe_sl_ycen:
 
 fe_sl_ysize:
   description: FE Slit Y Size
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-FE-SL1:SIZEY'}
   onFailure: buffer
   enabled: True
@@ -192,7 +192,7 @@ fe_sl_ysize:
 
 bsf_sl_xw:
   description: BSF slit outboard
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-BSFSLH:TRXW'}
   onFailure: buffer
   enabled: True
@@ -204,7 +204,7 @@ bsf_sl_xw:
 
 bsf_sl_xr:
   description: BSF slit inboard
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-BSFSLH:TRXR'}
   onFailure: buffer
   enabled: True
@@ -228,7 +228,7 @@ bsf_sl_yt:
 
 bsf_sl_yb:
   description: BSF slit bottom
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-BSFSLV:TRYB'}
   onFailure: buffer
   enabled: True
@@ -240,7 +240,7 @@ bsf_sl_yb:
 
 bsf_sl_xcen:
   description: BSF X centre
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-BSFSLH:CENTER'}
   onFailure: buffer
   enabled: True
@@ -252,7 +252,7 @@ bsf_sl_xcen:
 
 bsf_sl_xsize:
   description: BSF X size
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-BSFSLH:SIZE'}
   onFailure: buffer
   enabled: True
@@ -264,7 +264,7 @@ bsf_sl_xsize:
 
 bsf_sl_ycen:
   description: BSF Y centre
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-BSFSLV:CENTER'}
   onFailure: buffer
   enabled: True
@@ -276,7 +276,7 @@ bsf_sl_ycen:
 
 bsf_sl_ysize:
   description: BSF Y size
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-BSFSLV:SIZE'}
   onFailure: buffer
   enabled: True
@@ -288,7 +288,7 @@ bsf_sl_ysize:
 
 bsf_f1_y:
   description: BSF Filter 1 Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-BSFFI1:TRY'}
   onFailure: buffer
   enabled: True
@@ -300,7 +300,7 @@ bsf_f1_y:
 
 bsf_f2_y:
   description: BSF Filter 2 Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-BSFFI2:TRY'}
   onFailure: buffer
   enabled: True
@@ -312,7 +312,7 @@ bsf_f2_y:
 
 dcm_bragg:
   description: DCM Bragg angle
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-DCM:ROTY'}
   onFailure: buffer
   enabled: True
@@ -324,7 +324,7 @@ dcm_bragg:
 
 dcm_x:
   description: DCM lateral
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-DCM:TRX'}
   onFailure: buffer
   enabled: True
@@ -336,7 +336,7 @@ dcm_x:
 
 dcm_perp:
   description: DCM Perp
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-DCM:TRX-CR2'}
   onFailure: buffer
   enabled: True
@@ -348,7 +348,7 @@ dcm_perp:
 
 dcm_pitch:
   description: DCM 2nd crystal pitch
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-DCM:ROTY-CR2-PITCH'}
   onFailure: buffer
   enabled: True
@@ -360,7 +360,7 @@ dcm_pitch:
 
 dcm_fpitch:
   description: DCM 2nd crystal fine pitch
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-DCM:ROTY-CR2-FINEPITCH'}
   onFailure: buffer
   enabled: True
@@ -372,7 +372,7 @@ dcm_fpitch:
 
 dcm_froll:
   description: DCM 2nd crystal fine roll
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-OP-DCM:ROTZ-CR2-FINEROLL'}
   onFailure: buffer
   enabled: True
@@ -444,7 +444,7 @@ lu_bpmsum:
 
 lu_bpm_x:
   description: BPM2 X translation
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUBPM:TRX'}
   onFailure: buffer
   enabled: True
@@ -456,7 +456,7 @@ lu_bpm_x:
 
 lu_bpm_y:
   description: BPM2 Y translation
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUBPM:TRY'}
   onFailure: buffer
   enabled: True
@@ -468,7 +468,7 @@ lu_bpm_y:
 
 lu_z1:
   description: Lens Z1 Motion
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUTRZ1:TRZ'}
   onFailure: buffer
   enabled: True
@@ -480,7 +480,7 @@ lu_z1:
 
 lu_z2:
   description: Lens Z2 Motion
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUTRZ2:TRZ'}
   onFailure: buffer
   enabled: True
@@ -492,7 +492,7 @@ lu_z2:
 
 lu_pod1_y:
   description: SmarPod1 Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUPOD1:TRY'}
   onFailure: buffer
   enabled: True
@@ -504,7 +504,7 @@ lu_pod1_y:
 
 lu_pod1_z:
   description: SmarPod1 Z
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUPOD1:TRZ'}
   onFailure: buffer
   enabled: True
@@ -516,7 +516,7 @@ lu_pod1_z:
 
 lu_pod1_rotx:
   description: SmarPod1 RX
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUPOD1:ROTX'}
   onFailure: buffer
   enabled: True
@@ -528,7 +528,7 @@ lu_pod1_rotx:
 
 lu_pod1_roty:
   description: SmarPod1 RY
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUPOD1:ROTY'}
   onFailure: buffer
   enabled: True
@@ -540,7 +540,7 @@ lu_pod1_roty:
 
 lu_pod1_rotz:
   description: SmarPod1 RZ
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUPOD1:ROTZ'}
   onFailure: buffer
   enabled: True
@@ -552,7 +552,7 @@ lu_pod1_rotz:
 
 lu_pod2_y:
   description: SmarPod2 Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUPOD2:TRY'}
   onFailure: buffer
   enabled: True
@@ -564,7 +564,7 @@ lu_pod2_y:
 
 lu_pod2_z:
   description: SmarPod2 Z
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUPOD2:TRZ'}
   onFailure: buffer
   enabled: True
@@ -576,7 +576,7 @@ lu_pod2_z:
 
 lu_pod2_rotx:
   description: SmarPod2 RX
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUPOD2:ROTX'}
   onFailure: buffer
   enabled: True
@@ -588,7 +588,7 @@ lu_pod2_rotx:
 
 lu_pod2_roty:
   description: SmarPod2 RY
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUPOD2:ROTY'}
   onFailure: buffer
   enabled: True
@@ -600,7 +600,7 @@ lu_pod2_roty:
 
 lu_pod2_rotz:
   description: SmarPod2 RZ
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-LUPOD2:ROTZ'}
   onFailure: buffer
   enabled: True
@@ -672,7 +672,7 @@ ss_bpmsum:
 
 ss_bpm_x:
   description: SS BPM X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSBPM:TRX'}
   onFailure: buffer
   enabled: True
@@ -684,7 +684,7 @@ ss_bpm_x:
 
 ss_bpm_y:
   description: SS BPM Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSBPM:TRY'}
   onFailure: buffer
   enabled: True
@@ -696,7 +696,7 @@ ss_bpm_y:
 
 ss_f1_x:
   description: SS Filter 1 X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSFI1:TRX'}
   onFailure: buffer
   enabled: True
@@ -708,7 +708,7 @@ ss_f1_x:
 
 ss_f2_x:
   description: SS Filter 2 X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSFI2:TRX'}
   onFailure: buffer
   enabled: True
@@ -720,7 +720,7 @@ ss_f2_x:
 
 ss_f3_x:
   description: SS Filter 2 X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSFI3:TRX'}
   onFailure: buffer
   enabled: True
@@ -732,7 +732,7 @@ ss_f3_x:
 
 ss_f4_x:
   description: SS Filter 4 X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSFI4:TRX'}
   onFailure: buffer
   enabled: True
@@ -742,9 +742,21 @@ ss_f4_x:
   readOnly: False
   softwareTrigger: false
 
+ss_sl_xw:
+  description: SS slit wall
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SSSLH:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - ss
+  readOnly: False
+  softwareTrigger: false
+
 ss_sl_xr:
   description: SS slit ring
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSLH:TRXR'}
   onFailure: buffer
   enabled: True
@@ -756,7 +768,7 @@ ss_sl_xr:
 
 ss_sl_xcen:
   description: SS slit X centre
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSLH:CENTER'}
   onFailure: buffer
   enabled: True
@@ -768,7 +780,7 @@ ss_sl_xcen:
 
 ss_sl_xsize:
   description: SS slit X size
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSLH:SIZE'}
   onFailure: buffer
   enabled: True
@@ -780,7 +792,7 @@ ss_sl_xsize:
 
 ss_sl_yt:
   description: SS slit top
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSLV:TRYT'}
   onFailure: buffer
   enabled: True
@@ -792,7 +804,7 @@ ss_sl_yt:
 
 ss_sl_yb:
   description: SS slit bottom
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSLV:TRYB'}
   onFailure: buffer
   enabled: True
@@ -804,7 +816,7 @@ ss_sl_yb:
 
 ss_sl_ycen:
   description: SS slit Y centre
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSLV:CENTER'}
   onFailure: buffer
   enabled: True
@@ -816,7 +828,7 @@ ss_sl_ycen:
 
 ss_sl_ysize:
   description: SS slit Y size
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSLV:SIZE'}
   onFailure: buffer
   enabled: True
@@ -828,7 +840,7 @@ ss_sl_ysize:
 
 ss_xi_x:
   description: SS X-ray eye X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSXI:TRX'}
   onFailure: buffer
   enabled: True
@@ -841,7 +853,7 @@ ss_xi_x:
 
 ss_xi_y:
   description: SS X-ray eye Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSXI:TRY'}
   onFailure: buffer
   enabled: True
@@ -851,93 +863,9 @@ ss_xi_y:
   readOnly: False
   softwareTrigger: false
 
-ss_xicam_x:
-  description: ss cam X
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:CentroidX_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: True
-  softwareTrigger: false
-
-ss_xicam_y:
-  description: ss cam Y
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:CentroidY_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: True
-  softwareTrigger: false
-
-ss_xicam_max:
-  description: ss cam max value
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:MaxValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: True
-  softwareTrigger: false
-
-ss_xicam_exp:
-  description: ss camera exposure
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:cam1:AcquireTime', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_xicam_gain:
-  description: ss camera gain
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:cam1:Gain', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: False
-  softwareTrigger: false
-
-ss_xicam_xsig:
-  description: ss camera  x sigma
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:SigmaX_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: True
-  softwareTrigger: false
-
-ss_xicam_ysig:
-  description: ss camera y sigma
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X10SA-ES-SSCAM:Stats5:SigmaY_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - ss
-  readOnly: True
-  softwareTrigger: false
-
 vfm_xu:
   description: VFM Upstream X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRXU'}
   onFailure: buffer
   enabled: True
@@ -949,7 +877,7 @@ vfm_xu:
 
 vfm_xd:
   description: VFM Downstream X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRXD'}
   onFailure: buffer
   enabled: True
@@ -961,7 +889,7 @@ vfm_xd:
 
 vfm_yur:
   description: VFM Upstream Ring Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRYUR'}
   onFailure: buffer
   enabled: True
@@ -973,7 +901,7 @@ vfm_yur:
 
 vfm_yw:
   description: VFM Wall Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRYW'}
   onFailure: buffer
   enabled: True
@@ -985,7 +913,7 @@ vfm_yw:
 
 vfm_ydr:
   description: VFM Downstream Ring Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRYDR'}
   onFailure: buffer
   enabled: True
@@ -997,7 +925,7 @@ vfm_ydr:
 
 vfm_bu:
   description: VFM Upstream Bender
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:BNDU'}
   onFailure: buffer
   enabled: True
@@ -1009,7 +937,7 @@ vfm_bu:
 
 vfm_bd:
   description: VFM Downstream Bender
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:BNDD'}
   onFailure: buffer
   enabled: True
@@ -1021,7 +949,7 @@ vfm_bd:
 
 vfm_yaw:
   description: VFM Virtual Yaw
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:YAW'}
   onFailure: buffer
   enabled: True
@@ -1033,7 +961,7 @@ vfm_yaw:
 
 vfm_roll:
   description: VFM Virtual Roll
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:ROLL'}
   onFailure: buffer
   enabled: True
@@ -1045,7 +973,7 @@ vfm_roll:
 
 vfm_pitch:
   description: VFM Virtual Pitch
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:PITCH'}
   onFailure: buffer
   enabled: True
@@ -1057,7 +985,7 @@ vfm_pitch:
 
 vfm_x:
   description: VFM Virtual X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRX'}
   onFailure: buffer
   enabled: True
@@ -1069,7 +997,7 @@ vfm_x:
 
 vfm_y:
   description: VFM Virtual Y 
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRY'}
   onFailure: buffer
   enabled: True
@@ -1081,7 +1009,7 @@ vfm_y:
 
 hfm_xu:
   description: HFM Upstream X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRXU'}
   onFailure: buffer
   enabled: True
@@ -1093,7 +1021,7 @@ hfm_xu:
 
 hfm_xd:
   description: HFM Downstream X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRXD'}
   onFailure: buffer
   enabled: True
@@ -1105,7 +1033,7 @@ hfm_xd:
 
 hfm_yuw:
   description: HFM Upstream Wall Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRYUW'}
   onFailure: buffer
   enabled: True
@@ -1117,7 +1045,7 @@ hfm_yuw:
 
 hfm_yr:
   description: HFM Ring Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRYR'}
   onFailure: buffer
   enabled: True
@@ -1129,7 +1057,7 @@ hfm_yr:
 
 hfm_ydw:
   description: HFM Downstream Wall Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRYDW'}
   onFailure: buffer
   enabled: True
@@ -1141,7 +1069,7 @@ hfm_ydw:
 
 hfm_bu:
   description: HFM Upstream Bender
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:BNDU'}
   onFailure: buffer
   enabled: True
@@ -1153,7 +1081,7 @@ hfm_bu:
 
 hfm_bd:
   description: HFM Downstream Bender
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:BNDD'}
   onFailure: buffer
   enabled: True
@@ -1165,7 +1093,7 @@ hfm_bd:
 
 hfm_yaw:
   description: HFM Virtual Yaw
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:YAW'}
   onFailure: buffer
   enabled: True
@@ -1177,7 +1105,7 @@ hfm_yaw:
 
 hfm_roll:
   description: HFM Virtual Roll
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:ROLL'}
   onFailure: buffer
   enabled: True
@@ -1189,7 +1117,7 @@ hfm_roll:
 
 hfm_pitch:
   description: HFM Virtual Pitch
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:PITCH'}
   onFailure: buffer
   enabled: True
@@ -1201,7 +1129,7 @@ hfm_pitch:
 
 hfm_x:
   description: HFM Virtual X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRX'}
   onFailure: buffer
   enabled: True
@@ -1213,7 +1141,7 @@ hfm_x:
 
 hfm_y:
   description: HFM Virtual Y 
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRY'}
   onFailure: buffer
   enabled: True
@@ -1285,7 +1213,7 @@ bcu_bpmsum:
 
 bcu_bpm_x:
   description: BCU BPM X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-BCBPM:TRX'}
   onFailure: buffer
   enabled: True
@@ -1297,7 +1225,7 @@ bcu_bpm_x:
 
 bcu_bpm_y:
   description: BCU BPM Y 
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-BCBPM:TRY'}
   onFailure: buffer
   enabled: True
@@ -1307,115 +1235,6 @@ bcu_bpm_y:
   readOnly: False
   softwareTrigger: false
 
-bcu_sl_xw:
-  description: BCU slit wall
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-BCSLH:TRXW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bcu
-  readOnly: False
-  softwareTrigger: false
-
-bcu_sl_xr:
-  description: BCU slit ring
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-BCSLH:TRXR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bcu
-  readOnly: False
-  softwareTrigger: false
-
-bcu_sl_xcen:
-  description: BCU slit X centre
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-BCSLH:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bcu
-  readOnly: False
-  softwareTrigger: false
-
-bcu_sl_xsize:
-  description: BCU slit X size
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-BCSLH:SIZE'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bcu
-  readOnly: False
-  softwareTrigger: false
-
-bcu_sl_yt:
-  description: BCU slit top
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-BCSLV:TRYT'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bcu
-  readOnly: False
-  softwareTrigger: false
-
-bcu_sl_yb:
-  description: BCU slit bottom
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-BCSLV:TRYB'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bcu
-  readOnly: False
-  softwareTrigger: false
-
-bcu_sl_ycen:
-  description: BCU slit Y centre
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-BCSLV:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bcu
-  readOnly: False
-  softwareTrigger: false
-
-bcu_sl_ysize:
-  description: BCU slit Y size
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-BCSLV:SIZE'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - bcu
-  readOnly: False
-  softwareTrigger: false
-
-# xrf_pos:
-#   description: XRF det in/out
-#   deviceClass: ophyd.EpicsSignal
-#   deviceConfig: {read_pv: 'X10SA-ES-XRF:POS-SET', auto_monitor: true}
-#   onFailure: buffer
-#   enabled: True
-#   readoutPriority: baseline
-#   deviceTags:
-#     - se
-#   readOnly: False
-#   softwareTrigger: false
-#   userParameter: {"type":positioner}
-
 samcam_x:
   description: sample cam X 
   deviceClass: ophyd.EpicsSignalRO
@@ -1502,7 +1321,7 @@ samcam_gain:
 
 scam_zoom:
   description: Sample cam zoom
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-MS:ZOOM'}
   onFailure: buffer
   enabled: True
@@ -1512,21 +1331,9 @@ scam_zoom:
   readOnly: False
   softwareTrigger: false
 
-# fl_bright:
-#   description: Frontlight brightness
-#   deviceClass: ophyd.EpicsSignal
-#   deviceConfig: {read_pv: 'X10SA-ES-FL:SET', auto_monitor: true}
-#   onFailure: buffer
-#   enabled: True
-#   readoutPriority: baseline
-#   deviceTags:
-#     - se
-#   readOnly: False
-#   softwareTrigger: false
-
 coll_x:
   description: Collimator X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-COL:TRX'}
   onFailure: buffer
   enabled: True
@@ -1536,35 +1343,9 @@ coll_x:
   readOnly: False
   softwareTrigger: false
 
-# coll_y:
-#   description: Collimator Y
-#   deviceClass: ophyd.EpicsMotor
-#   deviceConfig: {prefix: 'X10SA-ES-COL:TRY'}
-#   onFailure: buffer
-#   enabled: True
-#   readoutPriority: baseline
-#   deviceTags:
-#     - se
-#   readOnly: False
-#   softwareTrigger: false
-#   userParameter: {"type": multi-position, "in": 41.5, "out": 20.0, "park": 0,"tol":0.05}
-
-# diag_y:
-#   description: Scintillator/diode Y
-#   deviceClass: ophyd.EpicsMotor
-#   deviceConfig: {prefix: 'X10SA-ES-SCL:TRY'}
-#   onFailure: buffer
-#   enabled: True
-#   readoutPriority: baseline
-#   deviceTags:
-#     - se
-#   readOnly: False
-#   softwareTrigger: false
-#   userParameter: {"type": multi-position, "scint": 38.62, "i1": 44.0, "out": 20.0,"park": 0,"tol":0.3}
-
 diag_z:
   description: Scintillator/diode Z
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SCL:TRZ'}
   onFailure: buffer
   enabled: True
@@ -1586,34 +1367,9 @@ i1:
   readOnly: True
   softwareTrigger: false
 
-# bl_pos:
-#   description: Backlight positioner
-#   deviceClass: ophyd.EpicsSignal
-#   deviceConfig: {read_pv: 'X10SA-ES-BL:POS-SET', auto_monitor: true}
-#   onFailure: buffer
-#   enabled: True
-#   readoutPriority: baseline
-#   deviceTags:
-#     - se
-#   readOnly: False
-#   softwareTrigger: false
-#   userParameter: {"type":positioner}
-
-# bl_bright:
-#   description: Backlight brightness
-#   deviceClass: ophyd.EpicsSignal
-#   deviceConfig: {read_pv: 'X10SA-ES-BL:SET', auto_monitor: true}
-#   onFailure: buffer
-#   enabled: True
-#   readoutPriority: baseline
-#   deviceTags:
-#     - se
-#   readOnly: False
-#   softwareTrigger: false
-
 bs_x:
   description: Beamstop X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-BS:TRX'}
   onFailure: buffer
   enabled: True
@@ -1625,7 +1381,7 @@ bs_x:
 
 bs_y:
   description: Beamstop Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-BS:TRY'}
   onFailure: buffer
   enabled: True
@@ -1635,48 +1391,9 @@ bs_y:
   readOnly: False
   softwareTrigger: false
 
-# bs_z:
-#   description: Beamstop Z
-#   deviceClass: ophyd.EpicsMotor
-#   deviceConfig: {prefix: 'X10SA-ES-BS:TRZ'}
-#   onFailure: buffer
-#   enabled: True
-#   readoutPriority: baseline
-#   deviceTags:
-#     - se
-#   readOnly: False
-#   softwareTrigger: false
-#   userParameter: {"type": guarded, "min": 13, "samp": 15, "work_min": 20, "safe": 41, "max_blin": 42, "max_blout": 70}
-
-# bs_pos:
-#   description: Beamstop positioner
-#   deviceClass: ophyd.EpicsSignal
-#   deviceConfig: {read_pv: 'X10SA-ES-BS:POS-SET', auto_monitor: true}
-#   onFailure: buffer
-#   enabled: True
-#   readoutPriority: baseline
-#   deviceTags:
-#     - se
-#   readOnly: False
-#   softwareTrigger: false
-#   userParameter: {"type":positioner}
-
-# gon_x:
-#   description: Goniometer X
-#   deviceClass: ophyd.EpicsMotor
-#   deviceConfig: {prefix: 'X10SA-ES-DF1:TRX1'}
-#   onFailure: buffer
-#   enabled: True
-#   readoutPriority: baseline
-#   deviceTags:
-#     - det
-#   readOnly: False
-#   softwareTrigger: false
-#   userParameter: {"type": guarded, "in": 18.0, "out": -10.0, "safe": -100,"tol":0.5}
-
 gon_y:
   description: Goniometer Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-DF1:TRY1'}
   onFailure: buffer
   enabled: True
@@ -1688,7 +1405,7 @@ gon_y:
 
 gon_z:
   description: Goniometer X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-DF1:TRZ1'}
   onFailure: buffer
   enabled: True
@@ -1700,7 +1417,7 @@ gon_z:
 
 omega:
   description: Omega
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-DF1:ROTU'}
   onFailure: buffer
   enabled: True
@@ -1710,22 +1427,9 @@ omega:
   readOnly: False
   softwareTrigger: false
 
-# cryo_pos:
-#   description: Cryo positioner
-#   deviceClass: ophyd.EpicsSignal
-#   deviceConfig: {read_pv: 'X10SA-ES-CS:POS-SET', auto_monitor: true}
-#   onFailure: buffer
-#   enabled: True
-#   readoutPriority: baseline
-#   deviceTags:
-#     - se
-#   readOnly: False
-#   softwareTrigger: false
-#   userParameter: {"type":positioner}
-
 cryo_x:
   description: Cryojet X 
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-CS:TRX'}
   onFailure: buffer
   enabled: True
@@ -1737,37 +1441,37 @@ cryo_x:
 
 det_xi_focus:
   description: X-ray eye 2 Focus
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-XEYE:FOCUS'}
   onFailure: buffer
   enabled: True
   readoutPriority: baseline
   deviceTags:
-    - detxi
+    - det
   readOnly: False
   softwareTrigger: false
 
 det_xi_zoom:
   description: X-ray eye 2 Zoom
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-XEYE:ZOOM'}
   onFailure: buffer
   enabled: True
   readoutPriority: baseline
   deviceTags:
-    - detxi
+    - det
   readOnly: False
   softwareTrigger: false
 
 det_xi_x:
   description: X-ray eye X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-XEYE:TRX'}
   onFailure: buffer
   enabled: True
   readoutPriority: baseline
   deviceTags:
-    - detxi
+    - det
   readOnly: False
   softwareTrigger: false
 
@@ -1783,106 +1487,9 @@ i2:
   readOnly: True
   softwareTrigger: false
 
-det_xicam_x:
-  description: sample cam X 
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-XEYE:Stats5:CentroidX_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - detxi
-  readOnly: True
-  softwareTrigger: false
-
-det_xicam_xsig:
-  description: sample cam X sigma
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-XEYE:Stats5:SigmaX_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - detxi
-  readOnly: True
-  softwareTrigger: false
-
-det_xicam_y:
-  description: sample cam Y 
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-XEYE:Stats5:CentroidY_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - detxi
-  readOnly: True
-  softwareTrigger: false
-
-det_xicam_ysig:
-  description: sample cam Y sigma
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-XEYE:Stats5:SigmaY_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - detxi
-  readOnly: True
-  softwareTrigger: false
-
-det_xicam_max:
-  description: sample cam max value
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-XEYE:Stats5:MaxValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - detxi
-  readOnly: True
-  softwareTrigger: false
-
-det_xicam_exp:
-  description: sample cam exp time
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X10SA-ES-XEYE:cam1:AcquireTime', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - detxi
-  readOnly: False
-  softwareTrigger: false
-
-det_xicam_gain:
-  description: sample cam gain
-  deviceClass: ophyd.EpicsSignal
-  deviceConfig: {read_pv: 'X10SA-ES-XEYE:cam1:Gain', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: baseline
-  deviceTags:
-    - detxi
-  readOnly: False
-  softwareTrigger: false
-
-# det_cov:
-#   description: Detector cover
-#   deviceClass: ophyd.EpicsSignal
-#   deviceConfig: {read_pv: 'X10SA-ES-DETCOV:SET', auto_monitor: true}
-#   onFailure: buffer
-#   enabled: True
-#   readoutPriority: baseline
-#   deviceTags:
-#     - det
-#   readOnly: False
-#   softwareTrigger: false
-#   userParameter: {"type":positioner}
-
 det_y:
   description: Detector Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-DET:TRY'}
   onFailure: buffer
   enabled: True
@@ -1894,7 +1501,7 @@ det_y:
 
 det_z:
   description: Detector Z
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-DET:TRZ'}
   onFailure: buffer
   enabled: True