diff --git a/script/local.py b/script/local.py
index 585f31a5..e1452f4c 100644
--- a/script/local.py
+++ b/script/local.py
@@ -178,37 +178,6 @@ def otf(mode="ENERGY", e1=None, e2=None, beta1=None, beta2=None, theta1=None, th
         })   
     
 diag_channels = []
-diag_channels.append(Scienta.channelBegin)       #diag_channels.append(ChannelDouble("ChannelBegin", "X03DA-SCIENTA:cam1:CHANNEL_BEGIN_RBV"))
-diag_channels.append(Scienta.channelEnd)         #diag_channels.append(ChannelDouble("ChannelEnd", "X03DA-SCIENTA:cam1:CHANNEL_END_RBV"))
-diag_channels.append(Scienta.sliceBegin)         # diag_channels.append(ChannelDouble("SliceBegin", "X03DA-SCIENTA:cam1:SLICE_BEGIN_RBV"))
-diag_channels.append(Scienta.sliceEnd)           #diag_channels.append(ChannelDouble("StepTime", "X03DA-SCIENTA:cam1:SLICE_END_RBV"))
-diag_channels.append(Scienta.numSlices)          # diag_channels.append(ChannelDouble("NumSlices", "X03DA-SCIENTA:cam1:SLICES_RBV"))
-#diag_channels.append(Scienta.frames)             # diag_channels.append(ChannelDouble("NumFrames", "X03DA-SCIENTA:cam1:FRAMES"))
-diag_channels.append(Scienta.numChannels)        #diag_channels.append(ChannelDouble("NumChannels", "X03DA-SCIENTA:cam1:NUM_CHANNELS_RBV")) 
-diag_channels.append(Scienta.lowEnergy)          #diag_channels.append(ChannelDouble("LowEnergy", "X03DA-SCIENTA:cam1:LOW_ENERGY_RBV"))
-diag_channels.append(Scienta.centerEnergy)       #diag_channels.append(ChannelDouble("CenterEnergy", "X03DA-SCIENTA:cam1:CENTRE_ENERGY_RBV"))
-diag_channels.append(Scienta.highEnergy)         #diag_channels.append(ChannelDouble("HighEnergy", "X03DA-SCIENTA:cam1:HIGH_ENERGY_RBV"))
-
-
-#TODO: These are not of Scienta device interface. Should be included?
-#diag_channels.append(ChannelDouble("AcquisitionModeNum", "X03DA-SCIENTA:cam1:ACQ_MODE_RBV"))
-#diag_channels.append(ChannelDouble("EnergyModeNum", "X03DA-SCIENTA:cam1:ENERGY_MODE_RBV"))
-#diag_channels.append(ChannelDouble("LensModeNum", "X03DA-SCIENTA:cam1:LENS_MODE_RBV"))
-#diag_channels.append(ChannelDouble("DetectorModeNum", "X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV"))
-#diag_channels.append(ChannelDouble("PassEnergyNum", "X03DA-SCIENTA:cam1:PASS_ENERGY_RBV"))
-#diag_channels.append(ChannelDouble("ElementSetNum", "X03DA-SCIENTA:cam1:ELEMENT_SET_RBV"))
-diag_channels.append(ScientaDwellTime)
-diag_channels.append(AcquisitionMode)            #diag_attrs.append(ChannelString("AcquisitionMode", "X03DA-SCIENTA:cam1:ACQ_MODE_RBV"))
-diag_channels.append(EnergyMode)                 #diag_attrs.append(ChannelString("EnergyMode", "X03DA-SCIENTA:cam1:ENERGY_MODE_RBV"))
-diag_channels.append(LensMode)                   #diag_attrs.append(ChannelString("LensMode", "X03DA-SCIENTA:cam1:LENS_MODE_RBV"))
-diag_channels.append(DetectorMode)               #diag_attrs.append(ChannelString("DetectorMode", "X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV"))
-diag_channels.append(PassEnergy)                 #diag_attrs.append(ChannelString("PassEnergy", "X03DA-SCIENTA:cam1:PASS_ENERGY_RBV"))
-diag_channels.append(ElementSet)                 #diag_attrs.append(ChannelString("ElementSet", "X03DA-SCIENTA:cam1:ELEMENT_SET_RBV"))
-diag_channels.append(ExcitationEnergy)           #diag_channels.append(ChannelDouble("ExcitationEnergy", "X03DA-SCIENTA:cam1:EXCITATION_ENERGY_RBV"))
-diag_channels.append(StepSize)                   #diag_channels.append(ChannelDouble("StepSize", "X03DA-SCIENTA:cam1:STEP_SIZE_RBV"))
-diag_channels.append(NumIterations)              #diag_channels.append(ChannelDouble("NumIterations", "X03DA-SCIENTA:cam1:NumExposures_RBV"))
-diag_channels.append(AnalyserSlit)               #diag_attrs.append(ChannelString("ElemeAnalyserSlitntSet", "X03DA-SCIENTA:cam1:ANALYSER_SLIT_RBV"))
-
 #Manipulator Settings
 diag_channels.append(ManipulatorX.readback)
 diag_channels.append(ManipulatorY.readback)
@@ -253,6 +222,7 @@ diag_channels.append(MonoEnergy)
 diag_channels.append(MonoCff)
 diag_channels.append(MonoBeta)
 diag_channels.append(MonoTheta)
+diag_channels.append(MonoGrating)
 diag_channels.append(ExitSlit)
 
 # Auxiliary Measurements
@@ -281,7 +251,34 @@ if get_device("ManipulatorCoolFlow"):
     diag_channels.append(ManipulatorCoolFlow)
 if get_device("ManipulatorCoolFlowSet"):
     diag_channels.append(ManipulatorCoolFlowSet)
-diag_channels.append(MonoGrating)
+
+diag_channels_no_Scienta = list(diag_channels)
+
+# Scienta
+diag_channels.append(Scienta.channelBegin)       #diag_channels.append(ChannelDouble("ChannelBegin", "X03DA-SCIENTA:cam1:CHANNEL_BEGIN_RBV"))
+diag_channels.append(Scienta.channelEnd)         #diag_channels.append(ChannelDouble("ChannelEnd", "X03DA-SCIENTA:cam1:CHANNEL_END_RBV"))
+diag_channels.append(Scienta.sliceBegin)         # diag_channels.append(ChannelDouble("SliceBegin", "X03DA-SCIENTA:cam1:SLICE_BEGIN_RBV"))
+diag_channels.append(Scienta.sliceEnd)           #diag_channels.append(ChannelDouble("StepTime", "X03DA-SCIENTA:cam1:SLICE_END_RBV"))
+diag_channels.append(Scienta.numSlices)          # diag_channels.append(ChannelDouble("NumSlices", "X03DA-SCIENTA:cam1:SLICES_RBV"))
+#diag_channels.append(Scienta.frames)             # diag_channels.append(ChannelDouble("NumFrames", "X03DA-SCIENTA:cam1:FRAMES"))
+diag_channels.append(Scienta.numChannels)        #diag_channels.append(ChannelDouble("NumChannels", "X03DA-SCIENTA:cam1:NUM_CHANNELS_RBV")) 
+diag_channels.append(Scienta.lowEnergy)          #diag_channels.append(ChannelDouble("LowEnergy", "X03DA-SCIENTA:cam1:LOW_ENERGY_RBV"))
+diag_channels.append(Scienta.centerEnergy)       #diag_channels.append(ChannelDouble("CenterEnergy", "X03DA-SCIENTA:cam1:CENTRE_ENERGY_RBV"))
+diag_channels.append(Scienta.highEnergy)         #diag_channels.append(ChannelDouble("HighEnergy", "X03DA-SCIENTA:cam1:HIGH_ENERGY_RBV"))
+
+diag_channels.append(ScientaDwellTime)
+diag_channels.append(AcquisitionMode)            #diag_attrs.append(ChannelString("AcquisitionMode", "X03DA-SCIENTA:cam1:ACQ_MODE_RBV"))
+diag_channels.append(EnergyMode)                 #diag_attrs.append(ChannelString("EnergyMode", "X03DA-SCIENTA:cam1:ENERGY_MODE_RBV"))
+diag_channels.append(LensMode)                   #diag_attrs.append(ChannelString("LensMode", "X03DA-SCIENTA:cam1:LENS_MODE_RBV"))
+diag_channels.append(DetectorMode)               #diag_attrs.append(ChannelString("DetectorMode", "X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV"))
+diag_channels.append(PassEnergy)                 #diag_attrs.append(ChannelString("PassEnergy", "X03DA-SCIENTA:cam1:PASS_ENERGY_RBV"))
+diag_channels.append(ElementSet)                 #diag_attrs.append(ChannelString("ElementSet", "X03DA-SCIENTA:cam1:ELEMENT_SET_RBV"))
+diag_channels.append(ExcitationEnergy)           #diag_channels.append(ChannelDouble("ExcitationEnergy", "X03DA-SCIENTA:cam1:EXCITATION_ENERGY_RBV"))
+diag_channels.append(StepSize)                   #diag_channels.append(ChannelDouble("StepSize", "X03DA-SCIENTA:cam1:STEP_SIZE_RBV"))
+diag_channels.append(NumIterations)              #diag_channels.append(ChannelDouble("NumIterations", "X03DA-SCIENTA:cam1:NumExposures_RBV"))
+diag_channels.append(AnalyserSlit)               #diag_attrs.append(ChannelString("ElemeAnalyserSlitntSet", "X03DA-SCIENTA:cam1:ANALYSER_SLIT_RBV"))
+
+
 
 snap_channels = []
 snap_channels.append(KeiSample.rangeCh)
@@ -423,10 +420,22 @@ def adjust_sensors():
 #Device aliases for data files
 set_device_alias(Scienta.dataMatrix, "ScientaImage")
 set_device_alias(Scienta.spectrum, "ScientaSpectrum")
-set_device_alias(Scienta.centerEnergy, get_diag_name(Scienta.centerEnergy))
+set_device_alias(Scienta.channelBegin, get_diag_name(Scienta.channelBegin))
+set_device_alias(Scienta.channelEnd, get_diag_name(Scienta.channelEnd))
+set_device_alias(Scienta.sliceBegin, get_diag_name(Scienta.sliceBegin))
+set_device_alias(Scienta.sliceEnd, get_diag_name(Scienta.sliceEnd))
+set_device_alias(Scienta.numChannels, get_diag_name(Scienta.numChannels))
+set_device_alias(Scienta.numSlices, get_diag_name(Scienta.numSlices))
 set_device_alias(Scienta.lowEnergy, get_diag_name(Scienta.lowEnergy))
+set_device_alias(Scienta.centerEnergy, get_diag_name(Scienta.centerEnergy))
 set_device_alias(Scienta.highEnergy, get_diag_name(Scienta.highEnergy))
 
+set_device_alias(ManipulatorX.readback, get_diag_name(ManipulatorX.readback))
+set_device_alias(ManipulatorY.readback, get_diag_name(ManipulatorY.readback))
+set_device_alias(ManipulatorZ.readback, get_diag_name(ManipulatorZ.readback))
+set_device_alias(ManipulatorTheta.readback, get_diag_name(ManipulatorTheta.readback))
+set_device_alias(ManipulatorTilt.readback, get_diag_name(ManipulatorTilt.readback))
+set_device_alias(ManipulatorPhi.readback, get_diag_name(ManipulatorPhi.readback))
 
 #Additional device configuration
 ManipulatorPhi.trustedWrite = False