diff --git a/pxii_bec/device_configs/device_config.yaml---- b/pxii_bec/device_configs/device_config.yaml----
deleted file mode 100644
index 12748fb..0000000
--- a/pxii_bec/device_configs/device_config.yaml----
+++ /dev/null
@@ -1,781 +0,0 @@
-sls_current:
-  description: SLS current
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'ARS07-DPCT-0100:CURR', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - SLS
-  readOnly: true
-  softwareTrigger: false
-ps1_press:
-  description: Photon shutter 1 pressure
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-FE-PSH1-VMCC-1010:PRESSURE', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - press
-  readOnly: true
-  softwareTrigger: false
-abs_press:
-  description: Absorber pressure
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-FE-VMCC-0000:PRESSURE', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - press
-  readOnly: true
-  softwareTrigger: false
-lu_bpmsum:
-  description: LU BPM Summed
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:SumAll:MeanValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: true
-  softwareTrigger: false
-ss_bpmsum:
-  description: SS BPM Summed
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: true
-  softwareTrigger: false
-bcu_bpm1:
-  description: BCU BPM Signal 1 
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:Current1:MeanValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: true
-  softwareTrigger: false
-bcu_bpm:
-  description: BCU BPM Summed
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: true
-  softwareTrigger: false
-i1:
-  description: BCU BPM Summed
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-ES-KBOX_K:READOUT', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: true
-  softwareTrigger: false
-samcam_x:
-  description: Sam cam X     
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:CentroidX_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: true
-  softwareTrigger: false
-samcam_xsig:
-  description: Sam cam X sigma
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:SigmaX_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: true
-  softwareTrigger: false
-samcam_y:
-  description: Sam cam Y     
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:CentroidY_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: true
-  softwareTrigger: false
-samcam_ysig:
-  description: Sam cam Y sigma
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-SAMCAM:Stats5:SigmaY_RBV', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bpm
-  readOnly: true
-  softwareTrigger: false
-fe_sxr:
-  description: 'FE Slit X Ring'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-FE-SLDI:TRXR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false 
-  softwareTrigger: false
-fe_syt:
-  description: 'FE Slit Y top'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-FE-SLDI:TRYT'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false 
-  softwareTrigger: false
-fe_sxw:
-  description: 'FE Slit X Wall'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-FE-SLDI:TRXW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false 
-  softwareTrigger: false
-fe_syb:
-  description: 'FE SlitY Bottom'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-FE-SLDI:TRYB'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false 
-  softwareTrigger: false
-fe_sxcen:
-  description: 'FE Slit X Centre'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-FE-SLDI:CENTERX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false 
-  softwareTrigger: false
-fe_sxsize:
-  description: 'FE Slit X Size'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-FE-SLDI:SIZEX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false 
-  softwareTrigger: false
-fe_sycen:
-  description: 'FE Slit Y Centre'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-FE-SLDI:CENTERY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false 
-  softwareTrigger: false
-fe_sysize:
-  description: 'FE Slit Y Size'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-FE-SLDI:SIZEY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: false 
-  softwareTrigger: false
-s1_xw:
-  description: 'BSF slit outboard'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLH:TRXW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_xr:
-  description: 'BSF slit inboard'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLH:TRXR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_yt:
-  description: 'BSF slit top'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLV:TRYT'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_yb:
-  description: 'BSF slit bottom'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLV:TRYB'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_xcen:
-  description: 'BSF X centre'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLH:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_xsize:
-  description: 'BSF X size'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLH:SIZE'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_ycen:
-  description: 'BSF Y centre'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLV:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-opf1_y:
-  description: 'BSF Filter 1 Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-FI1:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-opf2_y:
-  description: 'BSF Filter 2 Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-FI2:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-dcm_bragg:
-  description: 'DCM Bragg angle'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-DCM:ROTY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - dcm
-  readOnly: false 
-  softwareTrigger: false
-dcm_x:
-  description: 'DCM lateral'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-DCM:TRX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - dcm
-  readOnly: false 
-  softwareTrigger: false
-dcm_perp:
-  description: 'DCM Perp'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-DCM:TRX-C2'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - dcm
-  readOnly: false 
-  softwareTrigger: false
-dcm_pitch:
-  description: 'DCM 2nd crystal pitch'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-DCM:ROTY-C2'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - dcm
-  readOnly: false 
-  softwareTrigger: false
-ssbpm_x:
-  description: 'SS BPM X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSBPM1:TRX1'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-ssbpm_y:
-  description: 'SS BPM Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSBPM1:TRY1'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_xw:
-  description: 'SS slit wall'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSH1:TRXW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_xr:
-  description: 'SS slit ring'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSH1:TRXR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_xcen:
-  description: 'SS slit X centre'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSH1:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_xsize:
-  description: 'SS slit X size'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSH1:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_yt:
-  description: 'SS slit top'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSV1:TRYT'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_yb:
-  description: 'SS slit bottom'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSV1:TRYB'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_ycen:
-  description: 'SS slit Y centre'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSV1:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_ysize:
-  description: 'SS slit Y size'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSV1:SIZE'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-xeye_x:
-  description: 'SS X-ray eye X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSXI1:TRX1'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-xeye_y:
-  description: 'SS X-ray eye Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSXI1:TRY1'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-vfm_xu:
-  description: 'VFM Upstream X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRXU'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_xd:
-  description: 'VFM Downstream X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRXD'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_yur:
-  description: 'VFM Upstream Ring Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYUR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_yw:
-  description: 'VFM Wall Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_ydr:
-  description: 'VFM Downstream Ring Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYDR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_bu:
-  description: 'VFM Upstream Bender'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:BNDU'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_bd:
-  description: 'VFM Downstream Bender'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:BNDD'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_yaw:
-  description: 'VFM Virtual Yaw'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:YAW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_roll:
-  description: 'VFM Virtual Roll'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:ROLL'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_pitch:
-  description: 'VFM Virtual Pitch'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:PITCH'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_lat:
-  description: 'VFM Virtual X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_vert:
-  description: 'VFM Virtual Y '
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_xu:
-  description: 'HFM Upstream X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRXU'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_xd:
-  description: 'HFM Downstream X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRXD'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_yuw:
-  description: 'HFM Upstream Wall Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYUW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_yr:
-  description: 'HFM Ring Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_ydw:
-  description: 'HFM Downstream Wall Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYDW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_bu:
-  description: 'HFM Upstream Bender'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:BNDU'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_bd:
-  description: 'HFM Downstream Bender'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:BNDD'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_yaw:
-  description: 'HFM Virtual Yaw'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:YAW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_roll:
-  description: 'HFM Virtual Roll'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:ROLL'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_pitch:
-  description: 'HFM Virtual Pitch'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:PITCH'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_lat:
-  description: 'HFM Virtual X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_vert:
-  description: 'HFM Virtual Y '
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-bcubpm_x:
-  description: 'BCU BPM X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-BPM:TRX'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bcu
-  readOnly: false 
-  softwareTrigger: false
-bcubpm_y:
-  description: 'BCU BPM Y '
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-BPM:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bcu
-  readOnly: false 
-  softwareTrigger: false
diff --git a/pxii_bec/device_configs/device_config.yaml-tst b/pxii_bec/device_configs/device_config.yaml-tst
deleted file mode 100644
index 78713b3..0000000
--- a/pxii_bec/device_configs/device_config.yaml-tst
+++ /dev/null
@@ -1,543 +0,0 @@
-sls_current:
-  description: SLS current
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'ARS07-DPCT-0100:CURR', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - SLS
-  readOnly: true
-  softwareTrigger: false
-
-gap:
-  description: 'U19 gap'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-UIND:GAP'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - SLS
-  readOnly: false 
-  softwareTrigger: false
-
-ps1_press:
-  description: Pumpstand1 pressure
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-FE-PUM1-VPIG-1020:PRESSURE', auto_monitor: true}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  deviceTags:
-    - fe
-  readOnly: true
-  softwareTrigger: false
-
-#xbpm1_temp:
-#  description: XBPM1 temp
-#  deviceClass: ophyd.EpicsSignalRO
-#  deviceConfig: {read_pv: 'X10SA-FE-XBPM1-ETTC-0010:TEMP', auto_monitor: true}
-#  onFailure: buffer
-#  enabled: true
-#  readoutPriority: monitored
-#  deviceTags:
-#    - fe
-#  readOnly: true
-#  softwareTrigger: false
-
-s1_xw:
-  description: 'BSF slit outboard'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLH:TRXW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_xr:
-  description: 'BSF slit inboard'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLH:TRXR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_yt:
-  description: 'BSF slit top'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLV:TRYT'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_yb:
-  description: 'BSF slit bottom'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLV:TRYB'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_xcen:
-  description: 'BSF X centre'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLH:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_xsize:
-  description: 'BSF X size'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLH:SIZE'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-s1_ycen:
-  description: 'BSF Y centre'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-SLV:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-opf1_y:
-  description: 'BSF Filter 1 Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-FI1:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-opf2_y:
-  description: 'BSF Filter 2 Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-OP-FI2:TRY'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - bsf
-  readOnly: false 
-  softwareTrigger: false
-ssbpm_x:
-  description: 'SS BPM X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSBPM1:TRX1'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-ssbpm_y:
-  description: 'SS BPM Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSBPM1:TRY1'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_xw:
-  description: 'SS slit wall'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSH1:TRXW'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_xr:
-  description: 'SS slit ring'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSH1:TRXR'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_xcen:
-  description: 'SS slit X centre'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSH1:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_xsize:
-  description: 'SS slit X size'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSH1:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_yt:
-  description: 'SS slit top'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSV1:TRYT'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_yb:
-  description: 'SS slit bottom'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSV1:TRYB'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_ycen:
-  description: 'SS slit Y centre'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSV1:CENTER'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-s2_ysize:
-  description: 'SS slit Y size'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSSV1:SIZE'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-xeye_x:
-  description: 'SS X-ray eye X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSXI1:TRX1'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-xeye_y:
-  description: 'SS X-ray eye Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-SSXI1:TRY1'}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - ss
-  readOnly: false 
-  softwareTrigger: false
-vfm_xu:
-  description: 'VFM Upstream X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRXU'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_xd:
-  description: 'VFM Downstream X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRXD'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_yur:
-  description: 'VFM Upstream Ring Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYUR'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_yw:
-  description: 'VFM Wall Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYW'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_ydr:
-  description: 'VFM Downstream Ring Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRYDR'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_bu:
-  description: 'VFM Upstream Bender'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:BNDU'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_bd:
-  description: 'VFM Downstream Bender'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:BNDD'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_yaw:
-  description: 'VFM Virtual Yaw'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:YAW'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_roll:
-  description: 'VFM Virtual Roll'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:ROLL'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_pitch:
-  description: 'VFM Virtual Pitch'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:PITCH'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_lat:
-  description: 'VFM Virtual X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRX'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-vfm_vert:
-  description: 'VFM Virtual Y '
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-VFM:TRY'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - vfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_xu:
-  description: 'HFM Upstream X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRXU'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_xd:
-  description: 'HFM Downstream X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRXD'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_yuw:
-  description: 'HFM Upstream Wall Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYUW'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_yr:
-  description: 'HFM Ring Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYR'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_ydw:
-  description: 'HFM Downstream Wall Y'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRYDW'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_bu:
-  description: 'HFM Upstream Bender'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:BNDU'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_bd:
-  description: 'HFM Downstream Bender'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:BNDD'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_yaw:
-  description: 'HFM Virtual Yaw'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:YAW'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_roll:
-  description: 'HFM Virtual Roll'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:ROLL'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_pitch:
-  description: 'HFM Virtual Pitch'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:PITCH'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_lat:
-  description: 'HFM Virtual X'
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRX'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
-hfm_vert:
-  description: 'HFM Virtual Y '
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X10SA-ES-HFM:TRY'}
-  onFailure: buffer
-  enabled: False
-  readoutPriority: monitored
-  deviceTags:
-    - hfm
-  readOnly: false 
-  softwareTrigger: false
diff --git a/pxii_bec/device_configs/device_config.yaml b/pxii_bec/device_configs/pxii-autogenerated.yaml
similarity index 63%
rename from pxii_bec/device_configs/device_config.yaml
rename to pxii_bec/device_configs/pxii-autogenerated.yaml
index 2321058..7a44875 100644
--- a/pxii_bec/device_configs/device_config.yaml
+++ b/pxii_bec/device_configs/pxii-autogenerated.yaml
@@ -9,28 +9,6 @@ sls_current:
     - SLS
   readOnly: true
   softwareTrigger: false
-ps1_press:
-  description: Photon shutter 1 pressure
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-FE-PSH1-VMCC-1010:PRESSURE', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - press
-  readOnly: true
-  softwareTrigger: false
-abs_press:
-  description: Absorber pressure
-  deviceClass: ophyd.EpicsSignalRO
-  deviceConfig: {read_pv: 'X10SA-FE-VMCC-0000:PRESSURE', auto_monitor: true}
-  onFailure: buffer
-  enabled: True
-  readoutPriority: monitored
-  deviceTags:
-    - press
-  readOnly: true
-  softwareTrigger: false
 fe_bpm1:
   description: FE XBPM Signal 1
   deviceClass: ophyd.EpicsSignalRO
@@ -86,6 +64,50 @@ fe_bpmsum:
     - bpm
   readOnly: true
   softwareTrigger: false
+lu_bpm1:
+  description: LU BPM Signal 1
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current1:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpm2:
+  description: LU BPM Signal 2
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current2:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpm3:
+  description: LU BPM Signal 3
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current3:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+lu_bpm4:
+  description: LU BPM Signal 4
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-OP-LUBPM:Current4:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
 lu_bpmsum:
   description: LU BPM Summed
   deviceClass: ophyd.EpicsSignalRO
@@ -97,8 +119,52 @@ lu_bpmsum:
     - bpm
   readOnly: true
   softwareTrigger: false
-ss_bpmsum:
-  description: SS BPM Summed
+bsc_bpm1:
+  description: BSC BPM Signal 1
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current1:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpm2:
+  description: BSC BPM Signal 2
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current2:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpm3:
+  description: BSC BPM Signal 3
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current3:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpm4:
+  description: BSC BPM Signal 4
+  deviceClass: ophyd.EpicsSignalRO
+  deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:Current4:MeanValue_RBV', auto_monitor: true}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: monitored
+  deviceTags:
+    - bpm
+  readOnly: true
+  softwareTrigger: false
+bsc_bpmsum:
+  description: BSC BPM Summed
   deviceClass: ophyd.EpicsSignalRO
   deviceConfig: {read_pv: 'X10SA-ES-SSBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
   onFailure: buffer
@@ -119,7 +185,7 @@ bcu_bpm1:
     - bpm
   readOnly: true
   softwareTrigger: false
-bcu_bpm:
+bcu_bpmsum:
   description: BCU BPM Summed
   deviceClass: ophyd.EpicsSignalRO
   deviceConfig: {read_pv: 'X10SA-ES-ESBPM1:SumAll:MeanValue_RBV', auto_monitor: true}
@@ -149,7 +215,7 @@ samcam_x:
   enabled: True
   readoutPriority: monitored
   deviceTags:
-    - bpm
+    - scam
   readOnly: true
   softwareTrigger: false
 samcam_xsig:
@@ -160,7 +226,7 @@ samcam_xsig:
   enabled: True
   readoutPriority: monitored
   deviceTags:
-    - bpm
+    - scam
   readOnly: true
   softwareTrigger: false
 samcam_y:
@@ -171,7 +237,7 @@ samcam_y:
   enabled: True
   readoutPriority: monitored
   deviceTags:
-    - bpm
+    - scam
   readOnly: true
   softwareTrigger: false
 samcam_ysig:
@@ -182,688 +248,853 @@ samcam_ysig:
   enabled: True
   readoutPriority: monitored
   deviceTags:
-    - bpm
+    - scam
   readOnly: true
   softwareTrigger: false
 fe_bpm_x:
-  description: 'FE BPM X'
+  description: FE BPM X
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-XBPM1:TRX'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - fe
   readOnly: false 
   softwareTrigger: false
 fe_bpm_y:
-  description: 'FE BPM Y'
+  description: FE BPM Y
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-XBPM1:TRY'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - fe
   readOnly: false 
   softwareTrigger: false
 fe_sxr:
-  description: 'FE Slit X Ring'
+  description: FE Slit X Ring
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-SLDI:TRXR'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - fe
   readOnly: false 
   softwareTrigger: false
 fe_syt:
-  description: 'FE Slit Y top'
+  description: FE Slit Y top
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-SLDI:TRYT'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - fe
   readOnly: false 
   softwareTrigger: false
 fe_sxw:
-  description: 'FE Slit X Wall'
+  description: FE Slit X Wall
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-SLDI:TRXW'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - fe
   readOnly: false 
   softwareTrigger: false
 fe_syb:
-  description: 'FE SlitY Bottom'
+  description: FE SlitY Bottom
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-SLDI:TRYB'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - fe
   readOnly: false 
   softwareTrigger: false
 fe_sxcen:
-  description: 'FE Slit X Centre'
+  description: FE Slit X Centre
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-SLDI:CENTERX'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - fe
   readOnly: false 
   softwareTrigger: false
 fe_sxsize:
-  description: 'FE Slit X Size'
+  description: FE Slit X Size
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-SLDI:SIZEX'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - fe
   readOnly: false 
   softwareTrigger: false
 fe_sycen:
-  description: 'FE Slit Y Centre'
+  description: FE Slit Y Centre
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-SLDI:CENTERY'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - fe
   readOnly: false 
   softwareTrigger: false
 fe_sysize:
-  description: 'FE Slit Y Size'
+  description: FE Slit Y Size
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-FE-SLDI:SIZEY'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - fe
   readOnly: false 
   softwareTrigger: false
 s1_xw:
-  description: 'BSF slit outboard'
+  description: BSF slit outboard
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-SLH:TRXW'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bsf
   readOnly: false 
   softwareTrigger: false
 s1_xr:
-  description: 'BSF slit inboard'
+  description: BSF slit inboard
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-SLH:TRXR'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bsf
   readOnly: false 
   softwareTrigger: false
 s1_yt:
-  description: 'BSF slit top'
+  description: BSF slit top
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-SLV:TRYT'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bsf
   readOnly: false 
   softwareTrigger: false
 s1_yb:
-  description: 'BSF slit bottom'
+  description: BSF slit bottom
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-SLV:TRYB'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bsf
   readOnly: false 
   softwareTrigger: false
 s1_xcen:
-  description: 'BSF X centre'
+  description: BSF X centre
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-SLH:CENTER'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bsf
   readOnly: false 
   softwareTrigger: false
 s1_xsize:
-  description: 'BSF X size'
+  description: BSF X size
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-SLH:SIZE'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bsf
   readOnly: false 
   softwareTrigger: false
 s1_ycen:
-  description: 'BSF Y centre'
+  description: BSF Y centre
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-SLV:CENTER'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bsf
   readOnly: false 
   softwareTrigger: false
 s1_ysize:
-  description: 'BSF Y size'
+  description: BSF Y size
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-SLV:SIZE'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bsf
   readOnly: false 
   softwareTrigger: false
-opf1_y:
-  description: 'BSF Filter 1 Y'
+bsf_f1_y:
+  description: BSF Filter 1 Y
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-FI1:TRY'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bsf
   readOnly: false 
   softwareTrigger: false
-opf2_y:
-  description: 'BSF Filter 2 Y'
+bsf_f2_y:
+  description: BSF Filter 2 Y
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-FI2:TRY'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bsf
   readOnly: false 
   softwareTrigger: false
 dcm_bragg:
-  description: 'DCM Bragg angle'
+  description: DCM Bragg angle
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-DCM:ROTY'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - dcm
   readOnly: false 
   softwareTrigger: false
 dcm_x:
-  description: 'DCM lateral'
+  description: DCM lateral
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-DCM:TRX'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - dcm
   readOnly: false 
   softwareTrigger: false
 dcm_perp:
-  description: 'DCM Perp'
+  description: DCM Perp
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-DCM:TRX-C2'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - dcm
   readOnly: false 
   softwareTrigger: false
 dcm_pitch:
-  description: 'DCM 2nd crystal pitch'
+  description: DCM 2nd crystal pitch
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-OP-DCM:ROTY-C2'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - dcm
   readOnly: false 
   softwareTrigger: false
-ssbpm_x:
-  description: 'SS BPM X'
+lu_bpm_x:
+  description: BPM2 X translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-LUBPM:TRX'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - lu
+  readOnly: false 
+  softwareTrigger: false
+lu_bpm_y:
+  description: BPM2 Y translation
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-OP-LUBPM:TRY'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - lu
+  readOnly: false 
+  softwareTrigger: false
+bsc_bpm_x:
+  description: BSC BPM X
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSBPM1:TRX1'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
-ssbpm_y:
-  description: 'SS BPM Y'
+bsc_bpm_y:
+  description: BSC BPM Y
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSBPM1:TRY1'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
 s2_xw:
-  description: 'SS slit wall'
+  description: BSC slit wall
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSH1:TRXW'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
 s2_xr:
-  description: 'SS slit ring'
+  description: BSC slit ring
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSH1:TRXR'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
 s2_xcen:
-  description: 'SS slit X centre'
+  description: BSC slit X centre
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSH1:CENTER'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
 s2_xsize:
-  description: 'SS slit X size'
+  description: BSC slit X size
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSH1:CENTER'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
 s2_yt:
-  description: 'SS slit top'
+  description: BSC slit top
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSV1:TRYT'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
 s2_yb:
-  description: 'SS slit bottom'
+  description: BSC slit bottom
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSV1:TRYB'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
 s2_ycen:
-  description: 'SS slit Y centre'
+  description: BSC slit Y centre
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSV1:CENTER'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
 s2_ysize:
-  description: 'SS slit Y size'
+  description: BSC slit Y size
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSSV1:SIZE'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
 xeye_x:
-  description: 'SS X-ray eye X'
+  description: BSC X-ray eye X
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSXI1:TRX1'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
 xeye_y:
-  description: 'SS X-ray eye Y'
+  description: BSC X-ray eye Y
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-SSXI1:TRY1'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
-    - ss
+    - bsc
   readOnly: false 
   softwareTrigger: false
 vfm_xu:
-  description: 'VFM Upstream X'
+  description: VFM Upstream X
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRXU'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 vfm_xd:
-  description: 'VFM Downstream X'
+  description: VFM Downstream X
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRXD'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 vfm_yur:
-  description: 'VFM Upstream Ring Y'
+  description: VFM Upstream Ring Y
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRYUR'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 vfm_yw:
-  description: 'VFM Wall Y'
+  description: VFM Wall Y
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRYW'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 vfm_ydr:
-  description: 'VFM Downstream Ring Y'
+  description: VFM Downstream Ring Y
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRYDR'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 vfm_bu:
-  description: 'VFM Upstream Bender'
+  description: VFM Upstream Bender
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:BNDU'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 vfm_bd:
-  description: 'VFM Downstream Bender'
+  description: VFM Downstream Bender
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:BNDD'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 vfm_yaw:
-  description: 'VFM Virtual Yaw'
+  description: VFM Virtual Yaw
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:YAW'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 vfm_roll:
-  description: 'VFM Virtual Roll'
+  description: VFM Virtual Roll
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:ROLL'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 vfm_pitch:
-  description: 'VFM Virtual Pitch'
+  description: VFM Virtual Pitch
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:PITCH'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 vfm_lat:
-  description: 'VFM Virtual X'
+  description: VFM Virtual X
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRX'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 vfm_vert:
-  description: 'VFM Virtual Y '
+  description: VFM Virtual Y 
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-VFM:TRY'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - vfm
   readOnly: false 
   softwareTrigger: false
 hfm_xu:
-  description: 'HFM Upstream X'
+  description: HFM Upstream X
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRXU'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
 hfm_xd:
-  description: 'HFM Downstream X'
+  description: HFM Downstream X
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRXD'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
 hfm_yuw:
-  description: 'HFM Upstream Wall Y'
+  description: HFM Upstream Wall Y
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRYUW'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
 hfm_yr:
-  description: 'HFM Ring Y'
+  description: HFM Ring Y
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRYR'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
 hfm_ydw:
-  description: 'HFM Downstream Wall Y'
+  description: HFM Downstream Wall Y
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRYDW'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
 hfm_bu:
-  description: 'HFM Upstream Bender'
+  description: HFM Upstream Bender
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:BNDU'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
 hfm_bd:
-  description: 'HFM Downstream Bender'
+  description: HFM Downstream Bender
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:BNDD'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
 hfm_yaw:
-  description: 'HFM Virtual Yaw'
+  description: HFM Virtual Yaw
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:YAW'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
 hfm_roll:
-  description: 'HFM Virtual Roll'
+  description: HFM Virtual Roll
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:ROLL'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
 hfm_pitch:
-  description: 'HFM Virtual Pitch'
+  description: HFM Virtual Pitch
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:PITCH'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
 hfm_lat:
-  description: 'HFM Virtual X'
+  description: HFM Virtual X
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRX'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
 hfm_vert:
-  description: 'HFM Virtual Y '
+  description: HFM Virtual Y 
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-HFM:TRY'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - hfm
   readOnly: false 
   softwareTrigger: false
-bcubpm_x:
-  description: 'BCU BPM X'
+bcu_bpm_x:
+  description: BCU BPM X
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-BPM:TRX'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bcu
   readOnly: false 
   softwareTrigger: false
-bcubpm_y:
-  description: 'BCU BPM Y '
+bcu_bpm_y:
+  description: BCU BPM Y 
   deviceClass: ophyd.EpicsMotor
   deviceConfig: {prefix: 'X10SA-ES-BPM:TRY'}
   onFailure: buffer
   enabled: True
-  readoutPriority: monitored
+  readoutPriority: baseline
   deviceTags:
     - bcu
   readOnly: false 
   softwareTrigger: false
+s3_xw:
+  description: BCU slit wall
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:TRXW'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_xr:
+  description: BCU slit ring
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:TRXR'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_xcen:
+  description: BCU slit X centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_xsize:
+  description: BCU slit X size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLH:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_yt:
+  description: BCU slit top
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:TRYT'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_yb:
+  description: BCU slit bottom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:TRYB'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_ycen:
+  description: BCU slit Y centre
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:CENTER'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+s3_ysize:
+  description: BCU slit Y size
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SLV:SIZE'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - bcu
+  readOnly: false 
+  softwareTrigger: false
+scam_zoom:
+  description: Sample cam zoom
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SAMCAM:ZOOM'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - scam
+  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
+scin_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
+scin_z:
+  description: Scintillator/diode Z
+  deviceClass: ophyd.EpicsMotor
+  deviceConfig: {prefix: 'X10SA-ES-SCL:TRZ'}
+  onFailure: buffer
+  enabled: True
+  readoutPriority: baseline
+  deviceTags:
+    - se
+  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
diff --git a/pxii_bec/device_configs/x10sa_device_config.yaml b/pxii_bec/device_configs/x10sa_device_config.yaml
index d28a1af..60e4d34 100644
--- a/pxii_bec/device_configs/x10sa_device_config.yaml
+++ b/pxii_bec/device_configs/x10sa_device_config.yaml
@@ -1,5 +1,5 @@
 base_config:
-  - !include ./device_config.yaml
+  - !include ./pxii-autogenerated.yaml
 
 id_gap:
   readoutPriority: baseline