diff --git a/config/devices.properties b/config/devices.properties
index 4dd44fa..c6389dc 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -24,13 +24,13 @@ transmission=ch.psi.pshell.epics.ControlledVariable|X06DA-ES-FI:TRANSM-SET X06DA
 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|||
 detector_z=ch.psi.pshell.epics.Motor|X06DA-ES-DET:TRZ1|||true
 detector_y=ch.psi.pshell.epics.Motor|X06DA-ES-DET:TRY1|||true
 cryo_jet_tans=ch.psi.pshell.epics.Motor|X06DA-ES-CJ:TRX1|||true
-#beamstop=ch.psi.pshell.device.MotorGroupDiscretePositioner|beamstopX beamstopY beamstopZ|||
-#collimator=ch.psi.pshell.device.MotorGroupDiscretePositioner|collimatorX collimatorY|||
+aperture_x=ch.psi.pshell.epics.Motor|X06DA-ES-KBOX:TRX1|||true
+collimator_x=ch.psi.pshell.epics.Motor|X06DA-ES-KBOX:TRX2|||true
+diode_z=ch.psi.pshell.epics.Motor|X06DA-ES-KBOX:TRX3|||true
+#beamstop=ch.psi.pshell.device.MotorGroupDiscretePositioner|beamstop_x beamstop_y beamstop_z|||
 slithop=ch.psi.pshell.epics.Slit|X06DA-OP-SH1:TRX2 X06DA-OP-SH1:TRX1|||true
 slit1h_size=ch.psi.pshell.epics.Motor|X06DA-ES-SH1:TRX1|||true
 slit1h_center=ch.psi.pshell.epics.Motor|X06DA-ES-SH1:TRX2|||true