diff --git a/config/devices.properties b/config/devices.properties
index 5c83ef8..a61b6d2 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,4 +1,5 @@
-#diode=ch.psi.pshell.epics.ChannelDouble|X06DA-ES-KBOX_K:READOUT 6|||
+i0=ch.psi.pshell.epics.ChannelDouble|X06DA-ES-I0:READOUT 6|||true
+diode=ch.psi.pshell.epics.ChannelDouble|X06DA-ES-DIODE:READOUT|||true
 cats_block=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-CATS:BLOCKED|Read||true
 exp_shutter=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-PH1:SET|Read||true
 ketek=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-FD:SET-POS X06DA-ES-FD:GET-POS|Read||true
@@ -18,21 +19,15 @@ prigo_y=ch.psi.pshell.epics.Positionable|X06DA-ES-PRIGO:BLY X06DA-ES-PRIGO:BLY_R
 prigo_z=ch.psi.pshell.epics.Positionable|X06DA-ES-PRIGO:BLZ X06DA-ES-PRIGO:BLZ_RBV|Read||true
 flexor=ch.psi.pshell.epics.Motor|X06DA-ES-DFS:TRZ1|Read||true
 transmission=ch.psi.pshell.epics.ControlledVariable|X06DA-ES-FI:TRANSM-SET X06DA-ES-FI:TRANSM-GET|Read||true
-#aperture_x=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRX1|||
-#aperture_y=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRY1|||
 beamstop_x=ch.psi.pshell.epics.Motor|X06DA-ES-BS:TRX1|||true
 beamstop_y=ch.psi.pshell.epics.Motor|X06DA-ES-BS:TRY1|||true
 beamstop_z=ch.psi.pshell.epics.Motor|X06DA-ES-BS:TRZ1|||true
 #collimator_x=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRX2|||false
 #collimator_y=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRY2|||
-#scintillator_y=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRY3|||
-#scintillator_z=ch.psi.pshell.epics.Positionable|X06DA-ES-SCINTI:SET-FOCUS X06DA-ES-SCINTI:GET-FOCUS|||
 detector_z=ch.psi.pshell.epics.Motor|X06DA-ES-DET:TRZ1|||true
 detector_y=ch.psi.pshell.epics.Motor|X06DA-ES-DET:TRY1|||true
-#aperture=ch.psi.pshell.device.MotorGroupDiscretePositioner|apertureX apertureY|||
 #beamstop=ch.psi.pshell.device.MotorGroupDiscretePositioner|beamstopX beamstopY beamstopZ|||
 #collimator=ch.psi.pshell.device.MotorGroupDiscretePositioner|collimatorX collimatorY|||
-#scintillator=ch.psi.pshell.device.MotorGroupDiscretePositioner|scintillatorY|||
 slit1h=ch.psi.pshell.epics.Slit|X06DA-OP-SH1:TRX2 X06DA-OP-SH1:TRX1|||true
 #slit1V=ch.psi.pshell.epics.Slit|X06DA-OP-SV1:TRY1 X06DA-OP-SV1:TRY2|||
 #slit2H=ch.psi.pshell.epics.Slit|X06DA-OP-SH2:TRX2 X06DA-OP-SH2:TRX1|||
@@ -40,3 +35,5 @@ slit1h=ch.psi.pshell.epics.Slit|X06DA-OP-SH1:TRX2 X06DA-OP-SH1:TRX1|||true
 #lamp=ch.psi.pshell.epics.DiscretePositioner||||
 #backlight=ch.psi.pshell.epics.ProcessVariable|X06DA-ES-KOI:SET-LIGHT|||
 frontlight=ch.psi.pshell.epics.ProcessVariable|X06DA-ES-FL:SET-BRGHT|Read||true
+cam1=ch.psi.pshell.epics.AreaDetector|X06DA-SAMCAM:cam1 X06DA-SAMCAM:image1|||
+img1=ch.psi.pshell.imaging.CameraSource|cam1|||