diff --git a/src/aare/daq/devices.py b/src/aare/daq/devices.py
index 201e36c8..2eccd6a8 100644
--- a/src/aare/daq/devices.py
+++ b/src/aare/daq/devices.py
@@ -34,20 +34,25 @@ class BeamlineDevices:
         self.__ring_current_pv = PV(f"ARS07-DPCT-0100:CURR")
 
         self.__dtz = MyMotor(f"{BEAMLINE}-ES-DET:TRZ")
+        self.__dty = MyMotor(f"{BEAMLINE}-ES-DET:TRY")
+
+        self.__det_cov = EnumPV(name="det_cov",
+                                setpv=f"{BEAMLINE}-ES-DETCOV:SET",
+                                getpv=f"{BEAMLINE}-ES-DETCOV:GET")
 
         self.__sample_cam = epicsAD(f"{BEAMLINE}-SAMCAM:")
 
         self.__front_light = PredefinedPV(name='front_light',
-                                          setpv="{BEAMLINE}-ES-FL:SET",
-                                          getpv="{BEAMLINE}-ES-FL:GET",
+                                          setpv=f"{BEAMLINE}-ES-FL:SET",
+                                          getpv=f"{BEAMLINE}-ES-FL:GET",
                                           predefs={"off":1.49,
                                                 'half':2.0,
                                                 'max':3.0},
                                           timeout=10.0
                                           )
         self.__back_light  = PredefinedPV(name='back_light',
-                                setpv ="{BEAMLINE}-ES-BL:SET",
-                                getpv="{BEAMLINE}-ES-BL:GET",
+                                setpv =f"{BEAMLINE}-ES-BL:SET",
+                                getpv=f"{BEAMLINE}-ES-BL:GET",
                                 predefs={"off": 0,
                                          'half': 0.98,
                                          'max': 1.2},
@@ -59,15 +64,20 @@ class BeamlineDevices:
                                        getpv = f"{BEAMLINE}-ES-BL:POS-GET",
                                        timeout  = 10.0)
 
-        self.__collimator_pos = PV(f"{BEAMLINE}-ES-COL:TRY") # HOW TO HANDLE!!!
+        self.__collimator_pos = PV(f"{BEAMLINE}-ES-COL:TRY")
+        self.__collimator_z = MyMotor(f"{BEAMLINE}-ES-COL:TRZ") # HOW TO HANDLE!!!
 
         self.__scintillator_pos = PV(f"{BEAMLINE}-ES-SCL:TRY") # how to handle!!!
+        self.__scintillator_z = PV(f"{BEAMLINE}-ES-SCL:TRZ")
 
         self.__beamstop_pos = EnumPV(name = "beamstop_pos",
                                      setpv  = f"{BEAMLINE}-ES-BS:POS-SET",
                                      getpv = f"{BEAMLINE}-ES-BS:POS-GET",
                                      timeout  = 10.0)
 
+        self.__beamstop_x = MyMotor(f"{BEAMLINE}-ES-BS:TRX")
+        self.__beamstop_y = MyMotor(f"{BEAMLINE}-ES-BS:TRY")
+        self.__beamstop_z = MyMotor(f"{BEAMLINE}-ES-BS:TRZ")
 
 
         self.__zoom = SetGetPV(name  = f"zoom",
@@ -75,10 +85,12 @@ class BeamlineDevices:
                                getpv = f"{BEAMLINE}-ES-SAMCAM:ZOOM.RBV")
 
         self.__cryojet_pos = EnumPV(name='cryojet_pos',
-                                    setpv = f"{BEAMLINE}-ES-CJ:POS-SET",
-                                    getpv = f"{BEAMLINE}-ES-CJ:POS-GET",
+                                    setpv = f"{BEAMLINE}-ES-CS:POS-SET",
+                                    getpv = f"{BEAMLINE}-ES-CS:POS-GET",
                                     timeout = 10.0)
 
+        self.__cryojet_x = MyMotor(f"{BEAMLINE}-ES-CS:TRX")
+
 
 
 # Transmission