diff --git a/devices.py b/devices.py
index 6697129..9deee5e 100644
--- a/devices.py
+++ b/devices.py
@@ -48,21 +48,21 @@ flexSample = sd.endstations.alvra_huber.Huber(
     z_undulator=128
 )
 
-TalbotGratings = sd.general.smaract.SmarActStage(
-    "SARES11-XUSR125-1234",
-    linear_x="SARES11-XUSR125:SA_MOT1",
-    linear_y="SARES11-XUSR125:SA_MOT2",
-    linear_z="SARES11-XUSR125:SA_MOT3",
-    rotation="SARES11-XUSR125:SA_MOT4",
-    name="Talbot Gratings"
-)
+#TalbotGratings = sd.general.smaract.SmarActStage(
+#    "SARES11-XUSR125-1234",
+#    linear_x="SARES11-XUSR125:SA_MOT1",
+#    linear_y="SARES11-XUSR125:SA_MOT2",
+#    linear_z="SARES11-XUSR125:SA_MOT3",
+#    rotation="SARES11-XUSR125:SA_MOT4",
+#    name="Talbot Gratings"
+#)
 
-signalMirror = sd.general.smaract.SmarActStage(
-    "SARES11-XUSR125-56",
-    linear="SARES11-XUSR125:SA_MOT5",
-    rotation="SARES11-XUSR125:SA_MOT6",
-    name="Signal Mirror"
-)
+#signalMirror = sd.general.smaract.SmarActStage(
+#    "SARES11-XUSR125-56",
+#    linear="SARES11-XUSR125:SA_MOT5",
+#    rotation="SARES11-XUSR125:SA_MOT6",
+#    name="Signal Mirror"
+#)
 
 #primeMicroscope = sd.endstations.alvra_prime.Microscope(
 #    "SARES11-XMI125",
@@ -84,11 +84,11 @@ vacuum = sd.endstations.alvra_prime.Vacuum(
     z_undulator=127
 )
 
-primeCryTrans = sd.endstations.alvra_prime.VonHamosBragg(
-    "SARES11-XCRY125",
-    z_undulator=127,
-    description="Prime von Hamos X-trans (Bragg)"
-)
+#primeCryTrans = sd.endstations.alvra_prime.VonHamosBragg(
+#    "SARES11-XCRY125",
+#    z_undulator=127,
+#    description="Prime von Hamos X-trans (Bragg)"
+#)
 
 laser = sd.loptics.alvra_explaser.ExpLaser()
 
@@ -96,49 +96,51 @@ laserShutter = sd.loptics.lasershutter.LaserShutter(
     "SLAAR11-LDIO-LAS6891:SET_BO02"
 )
 
-#pbpsOpt = sd.xdiagnostics.intensitymonitor.IntensityMonitorPBPS(
-#    "SAROP11-PBPS117",
-#    VME_crate="SAROP11-CVME-PBPS2", # please check this!
-#    description="Intensity/position monitor after Optics hutch (PBPS)"
-#)
+pbpsOpt = sd.xdiagnostics.intensitymonitor.IntensityMonitorPBPS(
+    "SAROP11-PBPS110",
+    vme_crate="SAROP11-CVME-PBPS2", # please check this!
+    ch_up=11,
+    description="Intensity/position monitor in Optics hutch"
+)
 
 pbpsAtt = sd.xdiagnostics.intensitymonitor.IntensityMonitorPBPS(
     "SAROP11-PBPS122",
-    VME_crate="SAROP11-CVME-PBPS1",
+    vme_crate="SAROP11-CVME-PBPS1",
+    ch_up=4, ch_down=5, ch_right=3, ch_left=7,
     description="Intensity/Position monitor after Attenuator"
 )
 
-screenFE = sd.xdiagnostics.profilemonitor.PPRM(
+screenFE = sd.xdiagnostics.profilemonitor.ProfileMonitorPPRM(
     "SARFE10-PPRM053",
     description="Profile monitor after single-shot spectrometer (PPRM)"
 )
 
-screenOP = sd.xdiagnostics.profilemonitor.PPRM(
+screenOP = sd.xdiagnostics.profilemonitor.ProfileMonitorPPRM(
     "SARFE10-PPRM064",
     description="Profile monitor after Front End"
 )
 
-screenMirrAlv1 = sd.xdiagnostics.profilemonitor.PPRM(
+screenMirrAlv1 = sd.xdiagnostics.profilemonitor.ProfileMonitorPPRM(
     "SAROP11-PPRM066",
     description="Profile monitor after Alvra Mirror 1 (PPRM)"
 )
 
-screenMirrAlv2 = sd.xdiagnostics.profilemonitor.PPRM(
+screenMirrAlv2 = sd.xdiagnostics.profilemonitor.ProfileMonitorPPRM(
     "SAROP11-PPRM078",
     description="Profile monitor after Alvra Mirror 2 (PPRM)"
 )
 
-screenMirrorV2 = sd.xdiagnostics.profilemonitor.PPRM(
+screenMirrorV2 = sd.xdiagnostics.profilemonitor.ProfileMonitorPPRM(
     "SAROP11-PPRM110",
     description="Profile monitor after Vertical Mirror 2 (PPRM)"
 )
 
-screenOPEnd = sd.xdiagnostics.profilemonitor.PPRM(
+screenOPEnd = sd.xdiagnostics.profilemonitor.ProfileMonitorPPRM(
     "SAROP11-PPRM117",
     description="Profile monitor after Optics hutch (PPRM)"
 )
 
-screenAtt = sd.xdiagnostics.profilemonitor.PPRM(
+screenAtt = sd.xdiagnostics.profilemonitor.ProfileMonitorPPRM(
     "SAROP11-PPRM122",
     description="Profile monitor after Attenuator"
 )