diff --git a/devices.py b/devices.py
index c1fcec5..d5903e8 100644
--- a/devices.py
+++ b/devices.py
@@ -72,11 +72,11 @@ components = [
     },
     {
         "name": "mon_und",
-        "z_und": 53,
-        "desc": "Intensity/position monitor after Optics hutch",
-        "type": "slic.devices.xdiagnostics.intensity_monitors:SolidTargetDetectorPBPS",
+        "type": "slic.devices.xdiagnostics.intensitymonitor:SolidTargetDetectorPBPS",
         "args": ["SARFE10-PBPS053"],
         "kwargs": {},
+        "z_und": 53,
+        "desc": "Intensity/position monitor after Optics hutch",
     },
     {
         "name": "prof_fe",
@@ -159,19 +159,32 @@ components = [
     },
     {
         "name": "mon_opt_old",
+        "type": "slic.devices.xdiagnostics.intensitymonitor:SolidTargetDetectorPBPS",
+        "args": ["SAROP21-PBPS133"],
+        "kwargs": {"VME_crate": "SAROP21-CVME-PBPS1"},
         "z_und": 133,
         "desc": "Intensity/position monitor after Optics hutch",
-        "type": "slic.devices.xdiagnostics.intensity_monitors:SolidTargetDetectorPBPS",
-        "args": ["SAROP21-PBPS133"],
-        "kwargs": {"VME_crate": "SAROP21-CVME-PBPS1", "link": 9},
     },
     {
         "name": "mon_opt",
+        "type": "slic.devices.xdiagnostics.intensitymonitor:SolidTargetDetectorPBPS",
+        "args": ["SAROP21-PBPS133"],
+        "kwargs": {
+            'VME_crate': 'SAROP21-CVME-PBPS1',
+            'calib_channels': {
+                'up': 'SLAAR21-LSCP1-FNS:CH6:VAL_GET',
+                'down': 'SLAAR21-LSCP1-FNS:CH7:VAL_GET',
+                'left': 'SLAAR21-LSCP1-FNS:CH4:VAL_GET',
+                'right': 'SLAAR21-LSCP1-FNS:CH5:VAL_GET'
+            },
+            'calc_channels': {
+                'itot': 'SLAAR21-LTIM01-EVR0:CALCI',
+                'xpos': 'SLAAR21-LTIM01-EVR0:CALCX',
+                'ypos': 'SLAAR21-LTIM01-EVR0:CALCY'
+            }
+        },
         "z_und": 133,
         "desc": "Intensity/position monitor after Optics hutch",
-        "type": "slic.devices.xdiagnostics.intensity_monitors_new:SolidTargetDetectorPBPS_new",
-        "args": ["SAROP21-PBPS133"],
-        "kwargs": {"VME_crate": "SAROP21-CVME-PBPS1", "link": 9, 'channels':{'up':'SLAAR21-LSCP1-FNS:CH6:VAL_GET','down':'SLAAR21-LSCP1-FNS:CH7:VAL_GET','left':'SLAAR21-LSCP1-FNS:CH4:VAL_GET','right':'SLAAR21-LSCP1-FNS:CH5:VAL_GET'},'calc':{'itot':'SLAAR21-LTIM01-EVR0:CALCI','xpos':'SLAAR21-LTIM01-EVR0:CALCX','ypos':'SLAAR21-LTIM01-EVR0:CALCY'}},
     },
     {
         "name": "prof_opt",
@@ -217,11 +230,11 @@ components = [
     },
     {
         "name": "mon_att",
+        "type": "slic.devices.xdiagnostics.intensitymonitor:SolidTargetDetectorPBPS", 
         "args": ["SAROP21-PBPS138"],
+        "kwargs": {"VME_crate": "SAROP21-CVME-PBPS2"},
         "z_und": 138,
         "desc": "Intensity/Position monitor after Attenuator",
-        "type": "slic.devices.xdiagnostics.intensity_monitors:SolidTargetDetectorPBPS",
-        "kwargs": {"VME_crate": "SAROP21-CVME-PBPS2", "link": 9},
     },
     {
         "name": "det_dio",