diff --git a/GratingMonoScope/VSSettings/.vsm b/GratingMonoScope/VSSettings/.vsm
index 80af606..e223389 100644
--- a/GratingMonoScope/VSSettings/.vsm
+++ b/GratingMonoScope/VSSettings/.vsm
@@ -6,7 +6,7 @@
     <Node>
       <Title>Scope YT NC Project</Title>
       <Expanded>True</Expanded>
-      <FileName>C:\Users\nrw\plcprojs\lcls-plc-rixs-optics\GratingMonoScope\Scope YT NC Project.tcscopex</FileName>
+      <FileName>C:\Github (mghaly)\lcls-plc-rixs-optics\GratingMonoScope\Scope YT NC Project.tcscopex</FileName>
       <Children>
         <Node>
           <Title>DataPool</Title>
diff --git a/lcls-plc-rixs-optics/_Config/PLC/rixs_optics.xti b/lcls-plc-rixs-optics/_Config/PLC/rixs_optics.xti
index b3ef13b..8c37ae6 100644
--- a/lcls-plc-rixs-optics/_Config/PLC/rixs_optics.xti
+++ b/lcls-plc-rixs-optics/_Config/PLC/rixs_optics.xti
@@ -76,15 +76,15 @@
 			</Format>
 		</DataType>
 		<DataType>
-			<Name GUID="{D03D69A1-BF28-445B-838B-E78D4A687778}" Namespace="lcls_twincat_motion" AutoDeleteType="true">EL5042_Status</Name>
+			<Name GUID="{7CC27056-D141-4DE4-95D2-6B65B10B6AB4}" Namespace="lcls_twincat_motion" AutoDeleteType="true">EL5042_Status</Name>
 			<BitSize>0</BitSize>
 			<BaseType GUID="{FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF}"/>
 			<Hides>
-				<Hide GUID="{3FFD09D1-96AE-4CA8-9F3B-B190ED4E3132}"/>
+				<Hide GUID="{D03D69A1-BF28-445B-838B-E78D4A687778}"/>
 			</Hides>
 		</DataType>
 		<DataType>
-			<Name GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}" Namespace="lcls_twincat_motion" AutoDeleteType="true">ST_RenishawAbsEnc</Name>
+			<Name GUID="{C13F2823-EEBD-4580-AF38-47D327636A15}" Namespace="lcls_twincat_motion" AutoDeleteType="true">ST_RenishawAbsEnc</Name>
 			<Comment>
 				<![CDATA[Renishaw BiSS-C absolute encoder used with an EL5042]]>
 			</Comment>
@@ -106,7 +106,7 @@
 			</SubItem>
 			<SubItem>
 				<Name>Status</Name>
-				<Type GUID="{D03D69A1-BF28-445B-838B-E78D4A687778}" Namespace="lcls_twincat_motion">EL5042_Status</Type>
+				<Type GUID="{7CC27056-D141-4DE4-95D2-6B65B10B6AB4}" Namespace="lcls_twincat_motion">EL5042_Status</Type>
 				<Comment>
 					<![CDATA[Status struct placeholder]]>
 				</Comment>
@@ -123,7 +123,7 @@
 				<BitOffs>64</BitOffs>
 			</SubItem>
 			<Hides>
-				<Hide GUID="{C983838E-0160-447A-9028-BAAB11793078}"/>
+				<Hide GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}"/>
 			</Hides>
 		</DataType>
 		<DataType>
@@ -1377,7 +1377,7 @@ External Setpoint Generation:
 					<Comment>
 						<![CDATA[ Encoders]]>
 					</Comment>
-					<Type GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{C13F2823-EEBD-4580-AF38-47D327636A15}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -1399,7 +1399,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>PRG_MR1K1_BEND.M1K1.fbRunHOMS.stYdwnEnc</Name>
-					<Type GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{C13F2823-EEBD-4580-AF38-47D327636A15}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -1421,7 +1421,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>PRG_MR1K1_BEND.M1K1.fbRunHOMS.stXupEnc</Name>
-					<Type GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{C13F2823-EEBD-4580-AF38-47D327636A15}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -1443,7 +1443,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>PRG_MR1K1_BEND.M1K1.fbRunHOMS.stXdwnEnc</Name>
-					<Type GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{C13F2823-EEBD-4580-AF38-47D327636A15}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -1673,7 +1673,7 @@ Emergency Stop for MR1K1]]>
 					<Comment>
 						<![CDATA[ Encoders]]>
 					</Comment>
-					<Type GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{C13F2823-EEBD-4580-AF38-47D327636A15}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -1695,7 +1695,7 @@ Emergency Stop for MR1K1]]>
 				</Var>
 				<Var>
 					<Name>PRG_MR1K2_SWITCH.M1K2.fbRunHOMS.stYdwnEnc</Name>
-					<Type GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{C13F2823-EEBD-4580-AF38-47D327636A15}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -1717,7 +1717,7 @@ Emergency Stop for MR1K1]]>
 				</Var>
 				<Var>
 					<Name>PRG_MR1K2_SWITCH.M1K2.fbRunHOMS.stXupEnc</Name>
-					<Type GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{C13F2823-EEBD-4580-AF38-47D327636A15}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -1739,7 +1739,7 @@ Emergency Stop for MR1K1]]>
 				</Var>
 				<Var>
 					<Name>PRG_MR1K2_SWITCH.M1K2.fbRunHOMS.stXdwnEnc</Name>
-					<Type GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{C13F2823-EEBD-4580-AF38-47D327636A15}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -2192,7 +2192,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>PRG_SP1K1_MONO.mpi_upe</Name>
-					<Type GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{C13F2823-EEBD-4580-AF38-47D327636A15}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -2214,7 +2214,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>PRG_SP1K1_MONO.gpi_upe</Name>
-					<Type GUID="{FB7D5431-7B7B-4738-9231-480B0E95EB4A}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{C13F2823-EEBD-4580-AF38-47D327636A15}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -8722,8 +8722,8 @@ External Setpoint Generation:
 			<TaskPouOids>
 				<TaskPouOid Prio="19" OTCID="#x08502004"/>
 				<TaskPouOid Prio="1" OTCID="#x08502001"/>
-				<TaskPouOid Prio="3" OTCID="#x08502002"/>
 				<TaskPouOid Prio="20" OTCID="#x08502003"/>
+				<TaskPouOid Prio="3" OTCID="#x08502002"/>
 			</TaskPouOids>
 		</Instance>
 	</Project>
diff --git a/lcls-plc-rixs-optics/rixs_optics/POUs/PRG_ZeroOrder_PMPS.TcPOU b/lcls-plc-rixs-optics/rixs_optics/POUs/PRG_ZeroOrder_PMPS.TcPOU
index 9fd1f35..b9e2a0b 100644
--- a/lcls-plc-rixs-optics/rixs_optics/POUs/PRG_ZeroOrder_PMPS.TcPOU
+++ b/lcls-plc-rixs-optics/rixs_optics/POUs/PRG_ZeroOrder_PMPS.TcPOU
@@ -10,46 +10,57 @@ VAR
         i_Desc := 'Faults when Zero order beam safe conditions are not met',
         i_TypeCode := 16#F506);
     {attribute 'pytmc' := '
-        pv: SIM:SafeBenderRange
+        pv: @(PREFIX)SafeBenderRange
         field: ZNAM FALSE
         field: ONAM TRUE
     '}
     bSafeBenderRange : BOOL;
 
     {attribute 'pytmc' := '
-        pv: SIM:LRG_Grating_IN
+        pv: @(PREFIX)LRG_Grating_IN
         field: ZNAM FALSE
         field: ONAM TRUE
     '}
     bLRG_Grating_IN : BOOL;
 
     {attribute 'pytmc' := '
-        pv: SIM:ZOS_IN
+        pv: @(PREFIX)ZOS_IN
         field: ZNAM FALSE
         field: ONAM TRUE
     '}
     bZOS_IN : BOOL;
 
     {attribute 'pytmc' := '
-        pv: SIM:ZOB_on_Lower_Stopper
+        pv: :@(PREFIX)ZOB_on_Lower_Stopper
         field: ZNAM FALSE
         field: ONAM TRUE
     '}
     bZOB_on_Lower_Stopper : BOOL;
 
     {attribute 'pytmc' := '
-        pv: SIM:MR1K1_Inserted
+        pv: @(PREFIX)MR1K1_Inserted
         field: ZNAM FALSE
         field: ONAM TRUE
     '}
     bMR1K1_Inserted : BOOL;
 
+
+
+    {attribute 'pytmc' := '
+        pv: @(PREFIX)MachineMode
+        field: ZRST NC
+        field: ONST SC
+        field: TWST Misconfig
+        field: THST UnInit
+    '}
+    nMachineMode : INT;
+
     {attribute 'pytmc' := '
-        pv: SIM:ZeroOrderBeam
+        pv: @(PREFIX)BeamPermitted
         field: ZNAM FALSE
         field: ONAM TRUE
     '}
-    bZeroOrderBeam : BOOL;
+    bBeamPermitted : BOOL;
 
 
     Pm3 : LREAL;
@@ -86,33 +97,35 @@ VAR CONSTANT
     Zmon : LREAL:=739.622;//m
     Zpiv : LREAL:= 739.762 ; //m
     Zzos : LREAL:= 741.422;//m
+    Pm1Offset: LREAL:= 18181;//=18310-129
+    Pm2Offset: LREAL:= -90641;
+    Pm3Offset: LREAL:= -63300;//urad, could depend on the inserted grating
 END_VAR
 ]]></Declaration>
     <Implementation>
       <ST><![CDATA[
-ffZeroOrderBeam.i_xOK := SafeBenderRange() OR (bLRG_Grating_IN AND bZOS_IN AND bZeroOrderBeam AND MR1K1_Inserted());
+ffZeroOrderBeam.i_xOK := (SafeBenderRange() AND (((PMPS_GVL.stCurrentBeamParameters.nMachineMode =1(*SC*)) AND (PMPS_GVL.stCurrentBeamParameters.nBeamClass <=6)) OR (PMPS_GVL.stCurrentBeamParameters.nMachineMode =0(*NC*))))
+                OR (bLRG_Grating_IN AND bZOS_IN AND bZOB_on_Lower_Stopper AND MR1K1_Inserted()(*NC or SC Any Beamclass with beam at ZOS*));
 ffZeroOrderBeam(io_fbFFHWO := GVL_PMPS.fbFastFaultOutput1);
-bZOB_on_Lower_Stopper := ffZeroOrderBeam.i_xOK;
+bBeamPermitted := ffZeroOrderBeam.i_xOK;
 
 //Diagnostics
 bSafeBenderRange := SafeBenderRange();
-//bLRG_Grating_IN := LRG_Grating_IN();
-//bZOS_IN := ZOS_IN();
-bZOB_on_Lower_Stopper := ZOB_on_Lower_Stopper();
+nMachineMode := PMPS_GVL.stCurrentBeamParameters.nMachineMode;
 bMR1K1_Inserted := MR1K1_Inserted();
-//bZeroOrderBeam := ffZeroOrderBeam.i_xOK;
 
 
 
 
-//TRUE if hb0m3(Zzoz) - Hzos > D
+
+//TRUE if Hzos - hb0m3(Zzoz)  > D
 Ans := (Hzos*1E3) - Hb0m3; //um
 IF GVL_PMPS.rPhotonEnergy <550 THEN
-    bZeroOrderBeam := Ans > 3*1E3;
+    bZOB_on_Lower_Stopper := Ans > 3*1E3;
     ELSIF GVL_PMPS.rPhotonEnergy <1000 THEN
-        bZeroOrderBeam := Ans >  2.5*1E3;
+        bZOB_on_Lower_Stopper := Ans >  2.5*1E3;
     ELSIF GVL_PMPS.rPhotonEnergy >=1000 THEN
-        bZeroOrderBeam := Ans >  2*1E3;
+        bZOB_on_Lower_Stopper := Ans >  2*1E3;
 END_IF
 
 //
@@ -126,16 +139,16 @@ ACT_ExitSlitsGap();]]></ST>
         <ST><![CDATA[///calc
 //Hm1 = 1400000+mr1k1 ben Y up
 Hm1:= 1400000+M12.fPosition; //um
-//Pm1 = 18310 - 281 + mr1k1 bend pitch
-Pm1 := 18310 - 281 + Main.M16.fPosition; //urad
+//Pm1 = Pm1Offset + mr1k1 bend pitch
+Pm1 := Pm1Offset + Main.M16.fPosition; //urad
 //Hpiv = 1.620305 + 0.001 // m 0.001 is correction from nominal
 Hpiv:= (1.620305 + 0.001)*1E6; //um
-//Pm2 = mono mirror pitch - 90700 urad
-Pm2 := Main.M6.fPosition - 90700;//urad
+//Pm2 = mono mirror pitch + Pm2Offset urad
+Pm2 := Main.M6.fPosition + Pm2Offset;//urad
 //Hm3 = Hpiv + 0.006 m
 Hm3:= Hpiv + (0.006*1E6); //um
-//Pm3 = mono grating pitch - 63300 urad
-Pm3 := Main.M7.fPosition - 63300; //urad
+//Pm3 = mono grating pitch + Pm3Offset urad
+Pm3 := Main.M7.fPosition + Pm3Offset; //urad
 //Hzos = 1824.3 + st1k1_zos mm
 Hzos:= 1824.3 + M24.fPosition; //mm
 
@@ -204,93 +217,5 @@ END_VAR
     GVL_M1K1_BENDER_Constants.nM1K1bendDS_PMPS_LowerLimit < M18.nEncoderCount AND M18.nEncoderCount < GVL_M1K1_BENDER_Constants.nM1K1bendDS_PMPS_UpperLimit;]]></ST>
       </Implementation>
     </Method>
-    <Method Name="ZOB_on_Lower_Stopper" Id="{1038aeb1-9507-4623-b455-ede771c58d51}">
-      <Declaration><![CDATA[METHOD ZOB_on_Lower_Stopper : BOOL
-VAR_INPUT
-END_VAR
-VAR
-    Pm3 : LREAL;
-    Pm2: LREAL;
-    Pm1: LREAL;
-    Hm1: LREAL;
-    HZos:LREAL;
-    Zbm1: LREAL;
-    Zbm2: LREAL;
-    Zbm3: LREAL;
-    Hbm1: LREAL;
-    Hbm2: LREAL;
-    Hbm3: LREAL;
-    Hb0m3:LREAL;
-    //fixed calc
-    Hm3	 : LREAL;
-    Hpiv : LREAL;
-    Theta_m1: LREAL;
-    Theta_m2: LREAL;
-    Theta_m3: LREAL;
-    Delta : LREAL;
-    Ans : LREAL;
-END_VAR
-
-VAR CONSTANT
-    Hi2 :LREAL:=1.4;//m
-    Zi2: LREAL :=731.613;//m
-    Theta0 : LREAL:=0;
-    Zm1 : LREAL:=733.772;//m
-    Zmon : LREAL:=739.622;//m
-    Zpiv : LREAL:= 739.622 ; //m
-    Zzos : LREAL:= 741.422;//m
-END_VAR
-
-]]></Declaration>
-      <Implementation>
-        <ST><![CDATA[
-
-//Hm1 = 1400000+mr1k1 ben Y up
-Hm1:= 1400000+M12.fPosition; //um
-//Pm1 = 18310 - 281 + mr1k1 bend pitch
-Pm1 := 18310 - 281 + Main.M16.fPosition; //urad
-//Hpiv = 1.620305 + 0.001 // m 0.001 is correction from nominal
-Hpiv:= (1.620305 + 0.001)*1E6; //um
-//Pm2 = mono mirror pitch - 90700 urad
-Pm2 := Main.M6.fPosition - 90700;//urad
-//Hm3 = Hpiv + 0.006 m
-Hm3:= Hpiv + (0.006*1E6); //um
-//Pm3 = mono grating pitch - 63300 urad
-Pm3 := Main.M7.fPosition - 63300; //urad
-//Hzos = 1824.3 + st1k1_zos mm
-Hzos:= 1824.3 + M24.fPosition; //mm
-
-
-//urad
-Theta_m1 := 2*Pm1 - Theta0;
-Theta_m2 := 2*Pm2 - Theta_m1;
-Theta_m3 := 2 *Pm3 - 2 * Pm2 + 2* Pm1 - Theta0;
-
-// fix units
-//um
-Zbm1 := (Hm1 - TAN(Pm1)* (Zm1*1E6) - (Hi2*1E6) + TAN(Theta0) *(Zi2*1E6))/(TAN(Theta0) - TAN(Pm1));
-hbm1 := TAN(Pm1)*Zbm1 + Hm1 - TAN(Pm1)*(Zm1*1E6);
-//u?
-Zbm2 := (Hbm1 - TAN(Theta_m1)*Zbm1 - Hpiv + TAN(Pm2)*(Zpiv*1E6))/ (TAN(Pm2) - TAN(Theta_m1));
-Hbm2 := TAN(Pm2)*Zbm2 + Hpiv - TAN(Pm2)*(Zpiv*1E6);
-
-Zbm3 := (Hbm2 - TAN(Theta_m2)*Zbm2 - Hm3 + TAN(Pm3)*(Zpiv*1E6))/ (TAN(Pm3) - TAN(Theta_m2));
-Hbm3 := TAN(Pm3) * Zbm3 + Hm3 - TAN(Pm3)*(Zpiv*1E6);
-
-Hb0m3 := TAN(Theta_m3)*(Zzos*1E6) + Hbm3 - TAN(Theta_m3)*Zbm3;
-
-
-//TRUE if hb0m3(Zzoz) - Hzos > D
-Ans := Hb0m3 - (Hzos*1E3); //um
-IF GVL_PMPS.rPhotonEnergy <550 THEN
-    ZOB_on_Lower_Stopper := Ans > 6*1E3;
-    ELSIF GVL_PMPS.rPhotonEnergy <1000 THEN
-        ZOB_on_Lower_Stopper := Ans >  3.2*1E3;
-    ELSIF GVL_PMPS.rPhotonEnergy >=1000 THEN
-        ZOB_on_Lower_Stopper := Ans >  2.5*1E3;
-END_IF
-]]></ST>
-      </Implementation>
-    </Method>
   </POU>
 </TcPlcObject>
\ No newline at end of file
diff --git a/lcls-plc-rixs-optics/rixs_optics/rixs_optics.tmc b/lcls-plc-rixs-optics/rixs_optics/rixs_optics.tmc
index c720b55..0083aad 100644
--- a/lcls-plc-rixs-optics/rixs_optics/rixs_optics.tmc
+++ b/lcls-plc-rixs-optics/rixs_optics/rixs_optics.tmc
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TcModuleClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2009/05/TcModuleClass" Hash="{33B52CAB-E0C0-3364-5B59-E0A5C8C2748D}" GeneratedBy="TwinCAT XAE Plc">
+<TcModuleClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2009/05/TcModuleClass" Hash="{C2612948-999E-6EF5-819B-C9B3D1775369}" GeneratedBy="TwinCAT XAE Plc">
   <DataTypes>
     <DataType>
       <Name Namespace="Tc2_SerialCom">ComSerialLineMode_t</Name>
@@ -22781,11 +22781,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertEquals_BOOL</Name>
@@ -22921,11 +22916,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertEquals_STRING</Name>
@@ -23082,11 +23072,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>CalculateAndSetNumberOfAssertsForTest</Name>
@@ -23224,11 +23209,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>SetTestFailed</Name>
@@ -23387,11 +23367,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>IsTestFinished</Name>
@@ -23897,11 +23872,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertEquals_SINT</Name>
@@ -24674,11 +24644,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertEquals_TIME</Name>
@@ -25057,11 +25022,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertArrayEquals_INT</Name>
@@ -25156,11 +25116,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertFalse</Name>
@@ -25285,11 +25240,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertArrayEquals_LWORD</Name>
@@ -25394,11 +25344,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>GetTestByPosition</Name>
@@ -25710,11 +25655,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AreAllTestsFinished</Name>
@@ -25887,11 +25827,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>FindTestSuiteInstancePath</Name>
@@ -26073,11 +26008,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertArrayEquals_LREAL</Name>
@@ -26178,11 +26108,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>GetNumberOfSuccessfulTests</Name>
@@ -30013,11 +29938,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>FindTestSuiteInstancePath</Name>
@@ -30276,11 +30196,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertArrayEquals_BYTE</Name>
@@ -30385,11 +30300,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertEquals_DATE</Name>
@@ -30546,11 +30456,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertEquals_LTIME</Name>
@@ -30676,11 +30581,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertEquals_LREAL</Name>
@@ -30822,11 +30722,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertEquals</Name>
@@ -31585,11 +31480,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>SetHasStartedRunning</Name>
@@ -31750,11 +31640,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>GetHasStartedRunning</Name>
@@ -31860,11 +31745,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertEquals_WSTRING</Name>
@@ -32016,11 +31896,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertEquals_DINT</Name>
@@ -32146,11 +32021,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertEquals_STRING</Name>
@@ -32326,11 +32196,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertArray3dEquals_LREAL</Name>
@@ -32613,11 +32478,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>CalculateAndSetNumberOfAssertsForTest</Name>
@@ -33411,11 +33271,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Method>
         <Name>AssertArrayEquals_UDINT</Name>
@@ -33510,11 +33365,6 @@ contributing fast faults, unless the FFO is currently vetoed.
           <Type>DINT</Type>
           <BitSize>32</BitSize>
         </Local>
-        <Local>
-          <Name>__Index__0</Name>
-          <Type>DINT</Type>
-          <BitSize>32</BitSize>
-        </Local>
       </Method>
       <Properties>
         <Property>
@@ -60025,7 +59875,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
           <AreaNo AreaType="InputDst" CreateSymbols="true">0</AreaNo>
           <Name>SerialIO Inputs</Name>
           <ContextId>0</ContextId>
-          <ByteSize>163774464</ByteSize>
+          <ByteSize>163840000</ByteSize>
           <Symbol>
             <Name>GVL_SerialIO.Serial_stComIn_M1K2</Name>
             <Comment>Better have your inputs and outputs!
@@ -60048,7 +59898,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
           <AreaNo AreaType="OutputSrc" CreateSymbols="true">1</AreaNo>
           <Name>SerialIO Outputs</Name>
           <ContextId>0</ContextId>
-          <ByteSize>163774464</ByteSize>
+          <ByteSize>163840000</ByteSize>
           <Symbol>
             <Name>GVL_SerialIO.Serial_stComOut_M1K2</Name>
             <BitSize>192</BitSize>
@@ -60069,7 +59919,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
           <AreaNo AreaType="Internal" CreateSymbols="true">3</AreaNo>
           <Name>SerialIO Internal</Name>
           <ContextId>0</ContextId>
-          <ByteSize>163774464</ByteSize>
+          <ByteSize>163840000</ByteSize>
           <Symbol>
             <Name>P_Serial_Com.fbSerialLineControl_EL6001_M1K2</Name>
             <BitSize>10432</BitSize>
@@ -60167,7 +60017,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
           <AreaNo AreaType="Internal" CreateSymbols="true">19</AreaNo>
           <Name>PiezoDriver Internal</Name>
           <ContextId>1</ContextId>
-          <ByteSize>163774464</ByteSize>
+          <ByteSize>163840000</ByteSize>
           <Symbol>
             <Name>PiezoSerial.fbE621SerialDriver_M1K2</Name>
             <Comment>PI Serial</Comment>
@@ -60264,7 +60114,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
           <AreaNo AreaType="InputDst" CreateSymbols="true">32</AreaNo>
           <Name>DaqTask Inputs</Name>
           <ContextId>2</ContextId>
-          <ByteSize>163774464</ByteSize>
+          <ByteSize>163840000</ByteSize>
           <Symbol>
             <Name>PRG_DAQ_ENCODER.iLatchPos</Name>
             <Comment> Inputs</Comment>
@@ -60319,7 +60169,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
           <AreaNo AreaType="Internal" CreateSymbols="true">35</AreaNo>
           <Name>DaqTask Internal</Name>
           <ContextId>2</ContextId>
-          <ByteSize>163774464</ByteSize>
+          <ByteSize>163840000</ByteSize>
           <Symbol>
             <Name>GVL_Logger.sIpTidbit</Name>
             <BitSize>56</BitSize>
@@ -60834,7 +60684,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t
           <AreaNo AreaType="InputDst" CreateSymbols="true">48</AreaNo>
           <Name>PlcTask Inputs</Name>
           <ContextId>3</ContextId>
-          <ByteSize>163774464</ByteSize>
+          <ByteSize>163840000</ByteSize>
           <Symbol>
             <Name>LCLS_General.DefaultGlobals.stSys.I_EcatMaster1</Name>
             <Comment> AMS Net ID used for FB_EcatDiag, among others </Comment>
@@ -68735,7 +68585,7 @@ Emergency Stop for MR1K1</Comment>
           <AreaNo AreaType="OutputSrc" CreateSymbols="true">49</AreaNo>
           <Name>PlcTask Outputs</Name>
           <ContextId>3</ContextId>
-          <ByteSize>163774464</ByteSize>
+          <ByteSize>163840000</ByteSize>
           <Symbol>
             <Name>PRG_MR1K1_BEND.fbM1K1PitchControl.fbMotionStage.fbDriveVirtual.MasterAxis.PlcToNc</Name>
             <BitSize>1024</BitSize>
@@ -70847,7 +70697,7 @@ Emergency Stop for MR1K1</Comment>
           <AreaNo AreaType="Internal" CreateSymbols="true">51</AreaNo>
           <Name>PlcTask Internal</Name>
           <ContextId>3</ContextId>
-          <ByteSize>163774464</ByteSize>
+          <ByteSize>163840000</ByteSize>
           <Symbol>
             <Name>MOTION_GVL.fbPmpsFileReader</Name>
             <BitSize>928512</BitSize>
@@ -78974,7 +78824,7 @@ M1K1 BEND US ENC CNT</Comment>
               <Property>
                 <Name>pytmc</Name>
                 <Value>
-        pv: SIM:SafeBenderRange
+        pv: @(PREFIX)SafeBenderRange
         field: ZNAM FALSE
         field: ONAM TRUE
     </Value>
@@ -78990,7 +78840,7 @@ M1K1 BEND US ENC CNT</Comment>
               <Property>
                 <Name>pytmc</Name>
                 <Value>
-        pv: SIM:LRG_Grating_IN
+        pv: @(PREFIX)LRG_Grating_IN
         field: ZNAM FALSE
         field: ONAM TRUE
     </Value>
@@ -79688,7 +79538,7 @@ M1K1 BEND US ENC CNT</Comment>
               <Property>
                 <Name>pytmc</Name>
                 <Value>
-        pv: SIM:ZOS_IN
+        pv: @(PREFIX)ZOS_IN
         field: ZNAM FALSE
         field: ONAM TRUE
     </Value>
@@ -79704,7 +79554,7 @@ M1K1 BEND US ENC CNT</Comment>
               <Property>
                 <Name>pytmc</Name>
                 <Value>
-        pv: SIM:ZOB_on_Lower_Stopper
+        pv: :@(PREFIX)ZOB_on_Lower_Stopper
         field: ZNAM FALSE
         field: ONAM TRUE
     </Value>
@@ -79720,7 +79570,7 @@ M1K1 BEND US ENC CNT</Comment>
               <Property>
                 <Name>pytmc</Name>
                 <Value>
-        pv: SIM:MR1K1_Inserted
+        pv: @(PREFIX)MR1K1_Inserted
         field: ZNAM FALSE
         field: ONAM TRUE
     </Value>
@@ -79729,14 +79579,14 @@ M1K1 BEND US ENC CNT</Comment>
             <BitOffs>1287227824</BitOffs>
           </Symbol>
           <Symbol>
-            <Name>PRG_ZeroOrder_PMPS.bZeroOrderBeam</Name>
+            <Name>PRG_ZeroOrder_PMPS.bBeamPermitted</Name>
             <BitSize>8</BitSize>
             <BaseType>BOOL</BaseType>
             <Properties>
               <Property>
                 <Name>pytmc</Name>
                 <Value>
-        pv: SIM:ZeroOrderBeam
+        pv: @(PREFIX)BeamPermitted
         field: ZNAM FALSE
         field: ONAM TRUE
     </Value>
@@ -84001,12 +83851,59 @@ M4K2 KBV X ENC CNT</Comment>
             </Properties>
             <BitOffs>1302231008</BitOffs>
           </Symbol>
+          <Symbol>
+            <Name>PRG_ZeroOrder_PMPS.nMachineMode</Name>
+            <BitSize>16</BitSize>
+            <BaseType>INT</BaseType>
+            <Properties>
+              <Property>
+                <Name>pytmc</Name>
+                <Value>
+        pv: @(PREFIX)MachineMode
+        field: ZRST NC
+        field: ONST SC
+		field: TWST Misconfig
+		field: THST UnInit
+    </Value>
+              </Property>
+            </Properties>
+            <BitOffs>1302264976</BitOffs>
+          </Symbol>
+          <Symbol>
+            <Name>PRG_ZeroOrder_PMPS.Pm1Offset</Name>
+            <Comment>=18310-129</Comment>
+            <BitSize>64</BitSize>
+            <BaseType>LREAL</BaseType>
+            <Default>
+              <Value>18181</Value>
+            </Default>
+            <BitOffs>1302617600</BitOffs>
+          </Symbol>
+          <Symbol>
+            <Name>PRG_ZeroOrder_PMPS.Pm2Offset</Name>
+            <BitSize>64</BitSize>
+            <BaseType>LREAL</BaseType>
+            <Default>
+              <Value>-90641</Value>
+            </Default>
+            <BitOffs>1302617664</BitOffs>
+          </Symbol>
+          <Symbol>
+            <Name>PRG_ZeroOrder_PMPS.Pm3Offset</Name>
+            <Comment>urad, could depend on the inserted grating</Comment>
+            <BitSize>64</BitSize>
+            <BaseType>LREAL</BaseType>
+            <Default>
+              <Value>-63300</Value>
+            </Default>
+            <BitOffs>1302617728</BitOffs>
+          </Symbol>
         </DataArea>
         <DataArea>
           <AreaNo AreaType="RetainSrc" CreateSymbols="true">52</AreaNo>
           <Name>PlcTask Retains</Name>
           <ContextId>3</ContextId>
-          <ByteSize>163774464</ByteSize>
+          <ByteSize>163840000</ByteSize>
           <Symbol>
             <Name>PMPS_GVL.SuccessfulPreemption</Name>
             <Comment> Any time BPTM applies a new BP request which is confirmed</Comment>
@@ -84086,11 +83983,11 @@ M4K2 KBV X ENC CNT</Comment>
         </Property>
         <Property>
           <Name>ChangeDate</Name>
-          <Value>2023-08-24T10:17:58</Value>
+          <Value>2023-09-19T15:32:28</Value>
         </Property>
         <Property>
           <Name>GeneratedCodeSize</Name>
-          <Value>880640</Value>
+          <Value>876544</Value>
         </Property>
         <Property>
           <Name>GlobalDataSize</Name>