diff --git a/config/devices.properties b/config/devices.properties
index 9b0daa4..7a999d6 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,21 +1,21 @@
 diode=ch.psi.pshell.epics.ChannelDouble X10SA-ES-KBOX_K:READOUT Read
-apertureX=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRX1 false
-apertureY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY1 false
-beamstopX=ch.psi.pshell.epics.Motor X10SA-ES-BS:TRX1 false
-beamstopY=ch.psi.pshell.epics.Motor X10SA-ES-BS:TRY1 false
-beamstopZ=ch.psi.pshell.epics.Motor X10SA-ES-BS:TRZ1 false
-collimatorX=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRX2 false
-collimatorY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY2 false
-scintillatorY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY3 false
+apertureX=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRX1
+apertureY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY1
+beamstopX=ch.psi.pshell.epics.Motor X10SA-ES-BS:TRX1
+beamstopY=ch.psi.pshell.epics.Motor X10SA-ES-BS:TRY1
+beamstopZ=ch.psi.pshell.epics.Motor X10SA-ES-BS:TRZ1
+collimatorX=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRX2
+collimatorY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY2
+scintillatorY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY3
 scintillatorZ=ch.psi.pshell.epics.Positionable X10SA-ES-SCINTI:SET-FOCUS X10SA-ES-SCINTI:GET-FOCUS
-detectorZ=ch.psi.pshell.epics.Motor X10SA-ES-D:TRZ1 false
-detectorY=ch.psi.pshell.epics.Motor X10SA-ES-D:TRY1 false
+detectorZ=ch.psi.pshell.epics.Motor X10SA-ES-D:TRZ1
+detectorY=ch.psi.pshell.epics.Motor X10SA-ES-D:TRY1
 apertureTable=ch.psi.pshell.dev.MotorGroupBase apertureX apertureY
 beamstopTable=ch.psi.pshell.dev.MotorGroupBase beamstopX beamstopY beamstopZ
 collimatorTable=ch.psi.pshell.dev.MotorGroupBase collimatorX collimatorY
 collimator=ch.psi.pshell.dev.MotorGroupDiscretePositioner collimatorTable
 #scintillator=ch.psi.pshell.epics.Manipulator 
-slit1H=ch.psi.pshell.epics.Slit X10SA-OP-SH1:TRX2 X10SA-OP-SH1:TRX1 false
-slit1V=ch.psi.pshell.epics.Slit X10SA-OP-SV1:TRY1 X10SA-OP-SV1:TRY2 false
-slit2H=ch.psi.pshell.epics.Slit X10SA-OP-SH2:TRX2 X10SA-OP-SH2:TRX1 false
-slit2V=ch.psi.pshell.epics.Slit X10SA-OP-SV2:TRY1 X10SA-OP-SV2:TRY2 false
+slit1H=ch.psi.pshell.epics.Slit X10SA-OP-SH1:TRX2 X10SA-OP-SH1:TRX1
+slit1V=ch.psi.pshell.epics.Slit X10SA-OP-SV1:TRY1 X10SA-OP-SV1:TRY2
+slit2H=ch.psi.pshell.epics.Slit X10SA-OP-SH2:TRX2 X10SA-OP-SH2:TRX1
+slit2V=ch.psi.pshell.epics.Slit X10SA-OP-SV2:TRY1 X10SA-OP-SV2:TRY2