diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
index 8709fd2..8ce4d41 100644
--- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
@@ -4,64 +4,68 @@
   <Dig_In>
     <Block Index="0">
       <DI_ITEM Index="0" Name="DI_ChamLidClosed" BufferOffset="0" Addr="0" Description="" />
-      <DI_ITEM Index="1" Name="DI_PMGasDetectorFault" BufferOffset="1" Addr="1" Description="" />
-      <DI_ITEM Index="2" Name="DI_GBGasDetectorFault" BufferOffset="2" Addr="2" Description="" />
+      <DI_ITEM Index="1" Name="DI_PMGasDetectorSW" BufferOffset="1" Addr="1" Description="" />
+      <DI_ITEM Index="2" Name="DI_GBGasDetectorSW" BufferOffset="2" Addr="2" Description="" />
+      <DI_ITEM Index="3" Name="DI_ChamCabDoorClosed" BufferOffset="3" Addr="3" Description="" />
       <DI_ITEM Index="4" Name="DI_ChamPressAboveATMSW" BufferOffset="4" Addr="4" Description="" />
       <DI_ITEM Index="5" Name="DI_ChamAtSafeProcessPressSW" BufferOffset="5" Addr="5" Description="" />
       <DI_ITEM Index="6" Name="DI_DORPressVacSW" BufferOffset="6" Addr="6" Description="" />
       <DI_ITEM Index="7" Name="DI_DORPressATMSW" BufferOffset="7" Addr="7" Description="" />
-      <DI_ITEM Index="8" Name="DI_PumpExhaustDPLowAlarm" BufferOffset="8" Addr="8" Description="" />
+      <DI_ITEM Index="8" Name="DI_PMH2SDetector1SW" BufferOffset="8" Addr="8" Description="" />
       <DI_ITEM Index="9" Name="DI_PMATMSW" BufferOffset="9" Addr="9" Description="" />
-      <DI_ITEM Index="10" Name="DI_HeaterTempUpLimitAlarm" BufferOffset="10" Addr="10" Description="" />
-      <DI_ITEM Index="11" Name="DI_HeaterTempLowLimitSW" BufferOffset="11" Addr="11" Description="" />
+      <DI_ITEM Index="10" Name="DI_HeaterTempUpLimitSW" BufferOffset="10" Addr="10" Description="" />
+      <DI_ITEM Index="11" Name="DI_HeaterTempLowForLidMotionSW" BufferOffset="11" Addr="11" Description="" />
       <DI_ITEM Index="12" Name="DI_ConfinementRingUp" BufferOffset="12" Addr="12" Description="" />
-      <DI_ITEM Index="13" Name="DI_RotaryMotorSafeSpeed" BufferOffset="13" Addr="13" Description="" />
-      <DI_ITEM Index="14" Name="DI_PMH2SeDetectorAlarm" BufferOffset="14" Addr="14" Description="" />
-      <DI_ITEM Index="15" Name="DI_SHFlowLowAlarm" BufferOffset="15" Addr="15" Description="" />
+      <DI_ITEM Index="13" Name="DI_SusceptorAtSafeSpeed" BufferOffset="13" Addr="13" Description="" />
+      <DI_ITEM Index="14" Name="DI_PMH2SeDetector1SW" BufferOffset="14" Addr="14" Description="" />
+      <DI_ITEM Index="15" Name="DI_SHFlowSW" BufferOffset="15" Addr="15" Description="" />
       <DI_ITEM Index="16" Name="DI_ChamTopFlowSW" BufferOffset="16" Addr="16" Description="" />
       <DI_ITEM Index="17" Name="DI_ChamMiddleFlow1SW" BufferOffset="17" Addr="17" Description="" />
       <DI_ITEM Index="18" Name="DI_ChamBottomFlowSW" BufferOffset="18" Addr="18" Description="" />
-      <DI_ITEM Index="19" Name="DI_Foreline1FlowSW" BufferOffset="19" Addr="19" Description="" />
+      <DI_ITEM Index="19" Name="DI_Foreline1Flow" BufferOffset="19" Addr="19" Description="" />
       <DI_ITEM Index="20" Name="DI_PowerRod1FlowSW" BufferOffset="20" Addr="20" Description="" />
       <DI_ITEM Index="21" Name="DI_PowerRod2FlowSW" BufferOffset="21" Addr="21" Description="" />
-      <DI_ITEM Index="22" Name="DI_Foreline2FlowSW" BufferOffset="22" Addr="22" Description="" />
+      <DI_ITEM Index="22" Name="DI_Foreline2Flow" BufferOffset="22" Addr="22" Description="" />
       <DI_ITEM Index="23" Name="DI_ElectrodeWFlowSW" BufferOffset="23" Addr="23" Description="" />
-      <DI_ITEM Index="24" Name="DI_TMPumpFlowSW" BufferOffset="24" Addr="24" Description="" />
+      <DI_ITEM Index="24" Name="DI_TMPump1FlowSW" BufferOffset="24" Addr="24" Description="" />
       <DI_ITEM Index="25" Name="DI_TransformerFlowSW" BufferOffset="25" Addr="25" Description="" />
       <DI_ITEM Index="26" Name="DI_ChamMiddleFlow2SW" BufferOffset="26" Addr="26" Description="" />
       <DI_ITEM Index="27" Name="DI_InletTotalFlowLowSW" BufferOffset="27" Addr="27" Description="" />
       <DI_ITEM Index="28" Name="DI_InletTotalFlowHighSW" BufferOffset="28" Addr="28" Description="" />
       <DI_ITEM Index="30" Name="DI_PMH2DetectorSW" BufferOffset="30" Addr="30" Description="" />
       <DI_ITEM Index="31" Name="DI_ArInletPressSW" BufferOffset="31" Addr="31" Description="" />
-      <DI_ITEM Index="32" Name="DI_GBExhaustDPSW" BufferOffset="32" Addr="32" Description="" />
+      <DI_ITEM Index="32" Name="DI_GBSO2DetectorSW" BufferOffset="32" Addr="32" Description="" />
       <DI_ITEM Index="33" Name="DI_GBDoorClosed" BufferOffset="33" Addr="33" Description="" />
       <DI_ITEM Index="34" Name="DI_GBExhaustDPLowSW" BufferOffset="34" Addr="34" Description="" />
       <DI_ITEM Index="35" Name="DI_GasPipeTempCtrlAlarm" BufferOffset="35" Addr="35" Description="" />
-      <DI_ITEM Index="36" Name="DI_DryPump1Alarm" BufferOffset="36" Addr="36" Description="" />
+      <DI_ITEM Index="36" Name="DI_DryPumpAlarm" BufferOffset="36" Addr="36" Description="" />
       <DI_ITEM Index="38" Name="DI_PumpExhaustPressSW" BufferOffset="38" Addr="38" Description="" />
       <DI_ITEM Index="39" Name="DI_PMAExhaustDPSW" BufferOffset="39" Addr="39" Description="" />
-      <DI_ITEM Index="40" Name="DI_PMH2SDetectorSW" BufferOffset="40" Addr="40" Description="" />
+      <DI_ITEM Index="40" Name="DI_PumpExhaustDPSW" BufferOffset="40" Addr="40" Description="" />
       <DI_ITEM Index="41" Name="DI_ScrubberIntlkSW" BufferOffset="41" Addr="41" Description="" />
       <DI_ITEM Index="42" Name="DI_FacilityIntlkSW" BufferOffset="42" Addr="42" Description="" />
-      <DI_ITEM Index="45" Name="DI_RotaryMotorAlarm" BufferOffset="45" Addr="45" Description="" />
+      <DI_ITEM Index="45" Name="DI_ServoDriverFaultSW" BufferOffset="45" Addr="45" Description="" />
       <DI_ITEM Index="48" Name="DI_ReactorWaterLeakSW" BufferOffset="48" Addr="48" Description="" />
       <DI_ITEM Index="49" Name="DI_ChamLidPushButtonLocal" BufferOffset="49" Addr="49" Description="" />
       <DI_ITEM Index="50" Name="DI_ConfinementRingDown" BufferOffset="50" Addr="50" Description="" />
       <DI_ITEM Index="51" Name="DI_ReactorSuspectorCheck" BufferOffset="51" Addr="51" Description="" />
-      <DI_ITEM Index="52" Name="DI_PMSO2DetectorAlarm" BufferOffset="52" Addr="52" Description="" />
+      <DI_ITEM Index="52" Name="DI_PMSO2Detector1SW" BufferOffset="52" Addr="52" Description="" />
       <DI_ITEM Index="55" Name="DI_GN2InletPressSW" BufferOffset="55" Addr="55" Description="" />
-      <DI_ITEM Index="56" Name="DI_GBH2SDetectorAlarm" BufferOffset="56" Addr="56" Description="" />
-      <DI_ITEM Index="57" Name="DI_H2PressureSW" BufferOffset="57" Addr="57" Description="" />
-      <DI_ITEM Index="58" Name="DI_GBSmokeDetectorAlarm" BufferOffset="58" Addr="58" Description="" />
+      <DI_ITEM Index="56" Name="DI_GBH2SDetectorSW" BufferOffset="56" Addr="56" Description="" />
+      <DI_ITEM Index="57" Name="DI_GBH2SeDetectorSW" BufferOffset="57" Addr="57" Description="" />
+      <DI_ITEM Index="58" Name="DI_GBSmokeDetectorSW" BufferOffset="58" Addr="58" Description="" />
       <DI_ITEM Index="59" Name="DI_GBH2DetectorSW" BufferOffset="59" Addr="59" Description="" />
       <DI_ITEM Index="60" Name="DI_GBWaterLeakSW" BufferOffset="60" Addr="60" Description="" />
-      <DI_ITEM Index="63" Name="DI_H2PressureAlarm" BufferOffset="63" Addr="63" Description="" />
+      <DI_ITEM Index="63" Name="DI_H2PressureSW" BufferOffset="63" Addr="63" Description="" />
       <DI_ITEM Index="65" Name="DI_DryPump1Running" BufferOffset="65" Addr="65" Description="" />
       <DI_ITEM Index="67" Name="DI_DryPump1Warning" BufferOffset="67" Addr="67" Description="" />
-      <DI_ITEM Index="69" Name="DI_PMSmokeDetectorAlarm" BufferOffset="69" Addr="69" Description="" />
-      <DI_ITEM Index="70" Name="DI_EMOStatusAlarm" BufferOffset="70" Addr="70" Description="" />
-      <DI_ITEM Index="71" Name="DI_PumpCabDoorCloseDone" BufferOffset="71" Addr="71" Description="" />
+      <DI_ITEM Index="69" Name="DI_PMSmokeDetectorSW" BufferOffset="69" Addr="69" Description="" />
+      <DI_ITEM Index="70" Name="DI_EMOStatusSW" BufferOffset="70" Addr="70" Description="" />
+      <DI_ITEM Index="71" Name="DI_PumpCabDoorClosed" BufferOffset="71" Addr="71" Description="" />
       <DI_ITEM Index="72" Name="DI_FacilityWarningSW" BufferOffset="72" Addr="72" Description="" />
+      <DI_ITEM Index="73" Name="DI_PMH2SDetector2SW" BufferOffset="73" Addr="73" Description="" />
+      <DI_ITEM Index="74" Name="DI_PMH2SeDetector2SW" BufferOffset="74" Addr="74" Description="" />
+      <DI_ITEM Index="75" Name="DI_PMSO2Detector2SW" BufferOffset="75" Addr="75" Description="" />
       <DI_ITEM Index="76" Name="DI_MainCBStatusSW" BufferOffset="76" Addr="76" Description="" />
       <DI_ITEM Index="77" Name="DI_PowerRackWaterLeakSW" BufferOffset="77" Addr="77" Description="" />
       <DI_ITEM Index="78" Name="DI_UPS1Enable" BufferOffset="78" Addr="78" Description="" />
@@ -139,7 +143,6 @@
       <DI_ITEM Index="201" Name="DI_FinalOuterGasFB(V88)" BufferOffset="201" Addr="201" Description="" />
       <DI_ITEM Index="202" Name="DI_SrcLeakTestPreFilterFB(V69)" BufferOffset="202" Addr="202" Description="" />
       <DI_ITEM Index="203" Name="DI_PMTMBalanceFB(V70)" BufferOffset="203" Addr="203" Description="" />
-      <DI_ITEM Index="204" Name="DI_EPV11FB(EPV1-1)" BufferOffset="204" Addr="204" Description="" />
       <DI_ITEM Index="205" Name="DI_VentGasDumpFB(V72)" BufferOffset="205" Addr="205" Description="" />
       <DI_ITEM Index="206" Name="DI_SrcLeakTestPrePumpFB(V73)" BufferOffset="206" Addr="206" Description="" />
       <DI_ITEM Index="207" Name="DI_GasboxLeakTestFB(V74)" BufferOffset="207" Addr="207" Description="" />
@@ -244,6 +247,7 @@
       <DI_ITEM Index="341" Name="DI_ConfinementRingOnDownPos" BufferOffset="341" Addr="341" Description="" />
       <DI_ITEM Index="342" Name="DI_ConfinementRingServoError" BufferOffset="342" Addr="342" Description="" />
       <DI_ITEM Index="344" Name="DI_InletTotalTempHighSW" BufferOffset="344" Addr="344" Description="" />
+      <DI_ITEM Index="345" Name="DI_ChamPressAboveATMSW2" BufferOffset="345" Addr="345" Description="" />
       <DI_ITEM Index="347" Name="DI_PMTMS7ComErr" BufferOffset="347" Addr="347" Description="" />
       <DI_ITEM Index="348" Name="DI_PMTMTCPComErr" BufferOffset="348" Addr="348" Description="" />
       <DI_ITEM Index="349" Name="DI_EtherCATcomError" BufferOffset="349" Addr="349" Description="" />
@@ -288,15 +292,15 @@
       <DI_ITEM Index="388" Name="DI_MFC38Offline" BufferOffset="388" Addr="388" Description="" />
       <DI_ITEM Index="389" Name="DI_MFC39Offline" BufferOffset="389" Addr="389" Description="" />
       <DI_ITEM Index="390" Name="DI_MFC40Offline" BufferOffset="390" Addr="390" Description="" />
-      <DI_ITEM Index="391" Name="DI_PC1Offline" BufferOffset="391" Addr="391" Description="" />
-      <DI_ITEM Index="392" Name="DI_PC2Offline" BufferOffset="392" Addr="392" Description="" />
-      <DI_ITEM Index="393" Name="DI_PC3Offline" BufferOffset="393" Addr="393" Description="" />
-      <DI_ITEM Index="394" Name="DI_PC4Offline" BufferOffset="394" Addr="394" Description="" />
-      <DI_ITEM Index="395" Name="DI_PC5Offline" BufferOffset="395" Addr="395" Description="" />
-      <DI_ITEM Index="396" Name="DI_PC6Offline" BufferOffset="396" Addr="396" Description="" />
-      <DI_ITEM Index="397" Name="DI_PC7Offline" BufferOffset="397" Addr="397" Description="" />
-      <DI_ITEM Index="398" Name="DI_PC8Offline" BufferOffset="398" Addr="398" Description="" />
-      <DI_ITEM Index="399" Name="DI_PC9Offline" BufferOffset="399" Addr="399" Description="" />
+      <DI_ITEM Index="391" Name="DI_PC01Offline" BufferOffset="391" Addr="391" Description="" />
+      <DI_ITEM Index="392" Name="DI_PC02Offline" BufferOffset="392" Addr="392" Description="" />
+      <DI_ITEM Index="393" Name="DI_PC03Offline" BufferOffset="393" Addr="393" Description="" />
+      <DI_ITEM Index="394" Name="DI_PC04Offline" BufferOffset="394" Addr="394" Description="" />
+      <DI_ITEM Index="395" Name="DI_PC05Offline" BufferOffset="395" Addr="395" Description="" />
+      <DI_ITEM Index="396" Name="DI_PC06Offline" BufferOffset="396" Addr="396" Description="" />
+      <DI_ITEM Index="397" Name="DI_PC07Offline" BufferOffset="397" Addr="397" Description="" />
+      <DI_ITEM Index="398" Name="DI_PC08Offline" BufferOffset="398" Addr="398" Description="" />
+      <DI_ITEM Index="399" Name="DI_PC09Offline" BufferOffset="399" Addr="399" Description="" />
       <DI_ITEM Index="400" Name="DI_PC10Offline" BufferOffset="400" Addr="400" Description="" />
     </Block>
   </Dig_In>
@@ -429,7 +433,7 @@
       <DO_ITEM Index="170" Name="DO_ReactorATMTransferReady" BufferOffset="170" Addr="170" Description="" />
       <DO_ITEM Index="171" Name="DO_ReactorVACTransferReady" BufferOffset="171" Addr="171" Description="" />
       <DO_ITEM Index="172" Name="DO_PurgeRoutineSuscessed" BufferOffset="172" Addr="172" Description="" />
-      <DO_ITEM Index="173" Name="DO_CleanRoutineSucceed" BufferOffset="173" Addr="173" Description="" />
+      <DO_ITEM Index="173" Name="DO_CleanRoutineSuscessed" BufferOffset="173" Addr="173" Description="" />
       <DO_ITEM Index="174" Name="DO_ProcessRunning" BufferOffset="174" Addr="174" Description="" />
       <DO_ITEM Index="175" Name="DO_PreprocessRunning" BufferOffset="175" Addr="175" Description="" />
       <DO_ITEM Index="176" Name="DO_CyclePurgeRoutineRunning" BufferOffset="176" Addr="176" Description="" />
diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
index c03a376..c429bf9 100644
--- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
+++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
@@ -44,7 +44,7 @@
       <DI_ITEM Index="42" Name="DI_FacilityIntlk" BufferOffset="42" Addr="42" Description="" />
       <DI_ITEM Index="45" Name="DI_ServoDriverFaultSW" BufferOffset="45" Addr="45" Description="" />
       <DI_ITEM Index="48" Name="DI_ReactorWaterLeakAlarm" BufferOffset="48" Addr="48" Description="" />
-      <DI_ITEM Index="49" Name="DI_ChamLidPushButtonRemote" BufferOffset="49" Addr="49" Description="" />
+      <DI_ITEM Index="49" Name="DI_ChamLidPushButtonLocal" BufferOffset="49" Addr="49" Description="" />
       <DI_ITEM Index="50" Name="DI_ConfinementRingDown" BufferOffset="50" Addr="50" Description="" />
       <DI_ITEM Index="51" Name="DI_ReactorSuspectorCheck" BufferOffset="51" Addr="51" Description="" />
       <DI_ITEM Index="52" Name="DI_PMSO2DetectorAlarm" BufferOffset="52" Addr="52" Description="" />
diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml
index 03f0e75..ca2b02f 100644
--- a/App/SicSimulator/Config/_ioDefinePM.xml
+++ b/App/SicSimulator/Config/_ioDefinePM.xml
@@ -4,64 +4,68 @@
   <Dig_In>
     <Block Index="0">
       <DI_ITEM Index="0" Name="DI_ChamLidClosed" BufferOffset="0" Addr="0" Description="" />
-      <DI_ITEM Index="1" Name="DI_PMGasDetectorFault" BufferOffset="1" Addr="1" Description="" />
-      <DI_ITEM Index="2" Name="DI_GBGasDetectorFault" BufferOffset="2" Addr="2" Description="" />
+      <DI_ITEM Index="1" Name="DI_PMGasDetectorSW" BufferOffset="1" Addr="1" Description="" />
+      <DI_ITEM Index="2" Name="DI_GBGasDetectorSW" BufferOffset="2" Addr="2" Description="" />
+      <DI_ITEM Index="3" Name="DI_ChamCabDoorClosed" BufferOffset="3" Addr="3" Description="" />
       <DI_ITEM Index="4" Name="DI_ChamPressAboveATMSW" BufferOffset="4" Addr="4" Description="" />
       <DI_ITEM Index="5" Name="DI_ChamAtSafeProcessPressSW" BufferOffset="5" Addr="5" Description="" />
       <DI_ITEM Index="6" Name="DI_DORPressVacSW" BufferOffset="6" Addr="6" Description="" />
       <DI_ITEM Index="7" Name="DI_DORPressATMSW" BufferOffset="7" Addr="7" Description="" />
-      <DI_ITEM Index="8" Name="DI_PumpExhaustDPLowAlarm" BufferOffset="8" Addr="8" Description="" />
+      <DI_ITEM Index="8" Name="DI_PMH2SDetector1SW" BufferOffset="8" Addr="8" Description="" />
       <DI_ITEM Index="9" Name="DI_PMATMSW" BufferOffset="9" Addr="9" Description="" />
-      <DI_ITEM Index="10" Name="DI_HeaterTempUpLimitAlarm" BufferOffset="10" Addr="10" Description="" />
-      <DI_ITEM Index="11" Name="DI_HeaterTempLowLimitSW" BufferOffset="11" Addr="11" Description="" />
+      <DI_ITEM Index="10" Name="DI_HeaterTempUpLimitSW" BufferOffset="10" Addr="10" Description="" />
+      <DI_ITEM Index="11" Name="DI_HeaterTempLowForLidMotionSW" BufferOffset="11" Addr="11" Description="" />
       <DI_ITEM Index="12" Name="DI_ConfinementRingUp" BufferOffset="12" Addr="12" Description="" />
-      <DI_ITEM Index="13" Name="DI_RotaryMotorSafeSpeed" BufferOffset="13" Addr="13" Description="" />
-      <DI_ITEM Index="14" Name="DI_PMH2SeDetectorAlarm" BufferOffset="14" Addr="14" Description="" />
-      <DI_ITEM Index="15" Name="DI_SHFlowLowAlarm" BufferOffset="15" Addr="15" Description="" />
+      <DI_ITEM Index="13" Name="DI_SusceptorAtSafeSpeed" BufferOffset="13" Addr="13" Description="" />
+      <DI_ITEM Index="14" Name="DI_PMH2SeDetector1SW" BufferOffset="14" Addr="14" Description="" />
+      <DI_ITEM Index="15" Name="DI_SHFlowSW" BufferOffset="15" Addr="15" Description="" />
       <DI_ITEM Index="16" Name="DI_ChamTopFlowSW" BufferOffset="16" Addr="16" Description="" />
       <DI_ITEM Index="17" Name="DI_ChamMiddleFlow1SW" BufferOffset="17" Addr="17" Description="" />
       <DI_ITEM Index="18" Name="DI_ChamBottomFlowSW" BufferOffset="18" Addr="18" Description="" />
-      <DI_ITEM Index="19" Name="DI_Foreline1FlowSW" BufferOffset="19" Addr="19" Description="" />
+      <DI_ITEM Index="19" Name="DI_Foreline1Flow" BufferOffset="19" Addr="19" Description="" />
       <DI_ITEM Index="20" Name="DI_PowerRod1FlowSW" BufferOffset="20" Addr="20" Description="" />
       <DI_ITEM Index="21" Name="DI_PowerRod2FlowSW" BufferOffset="21" Addr="21" Description="" />
-      <DI_ITEM Index="22" Name="DI_Foreline2FlowSW" BufferOffset="22" Addr="22" Description="" />
+      <DI_ITEM Index="22" Name="DI_Foreline2Flow" BufferOffset="22" Addr="22" Description="" />
       <DI_ITEM Index="23" Name="DI_ElectrodeWFlowSW" BufferOffset="23" Addr="23" Description="" />
-      <DI_ITEM Index="24" Name="DI_TMPumpFlowSW" BufferOffset="24" Addr="24" Description="" />
+      <DI_ITEM Index="24" Name="DI_TMPump1FlowSW" BufferOffset="24" Addr="24" Description="" />
       <DI_ITEM Index="25" Name="DI_TransformerFlowSW" BufferOffset="25" Addr="25" Description="" />
       <DI_ITEM Index="26" Name="DI_ChamMiddleFlow2SW" BufferOffset="26" Addr="26" Description="" />
       <DI_ITEM Index="27" Name="DI_InletTotalFlowLowSW" BufferOffset="27" Addr="27" Description="" />
       <DI_ITEM Index="28" Name="DI_InletTotalFlowHighSW" BufferOffset="28" Addr="28" Description="" />
       <DI_ITEM Index="30" Name="DI_PMH2DetectorSW" BufferOffset="30" Addr="30" Description="" />
       <DI_ITEM Index="31" Name="DI_ArInletPressSW" BufferOffset="31" Addr="31" Description="" />
-      <DI_ITEM Index="32" Name="DI_GBExhaustDPSW" BufferOffset="32" Addr="32" Description="" />
+      <DI_ITEM Index="32" Name="DI_GBSO2DetectorSW" BufferOffset="32" Addr="32" Description="" />
       <DI_ITEM Index="33" Name="DI_GBDoorClosed" BufferOffset="33" Addr="33" Description="" />
       <DI_ITEM Index="34" Name="DI_GBExhaustDPLowSW" BufferOffset="34" Addr="34" Description="" />
       <DI_ITEM Index="35" Name="DI_GasPipeTempCtrlAlarm" BufferOffset="35" Addr="35" Description="" />
-      <DI_ITEM Index="36" Name="DI_DryPump1Alarm" BufferOffset="36" Addr="36" Description="" />
+      <DI_ITEM Index="36" Name="DI_DryPumpAlarm" BufferOffset="36" Addr="36" Description="" />
       <DI_ITEM Index="38" Name="DI_PumpExhaustPressSW" BufferOffset="38" Addr="38" Description="" />
       <DI_ITEM Index="39" Name="DI_PMAExhaustDPSW" BufferOffset="39" Addr="39" Description="" />
-      <DI_ITEM Index="40" Name="DI_PMH2SDetectorSW" BufferOffset="40" Addr="40" Description="" />
+      <DI_ITEM Index="40" Name="DI_PumpExhaustDPSW" BufferOffset="40" Addr="40" Description="" />
       <DI_ITEM Index="41" Name="DI_ScrubberIntlkSW" BufferOffset="41" Addr="41" Description="" />
       <DI_ITEM Index="42" Name="DI_FacilityIntlkSW" BufferOffset="42" Addr="42" Description="" />
-      <DI_ITEM Index="45" Name="DI_RotaryMotorAlarm" BufferOffset="45" Addr="45" Description="" />
+      <DI_ITEM Index="45" Name="DI_ServoDriverFaultSW" BufferOffset="45" Addr="45" Description="" />
       <DI_ITEM Index="48" Name="DI_ReactorWaterLeakSW" BufferOffset="48" Addr="48" Description="" />
       <DI_ITEM Index="49" Name="DI_ChamLidPushButtonLocal" BufferOffset="49" Addr="49" Description="" />
       <DI_ITEM Index="50" Name="DI_ConfinementRingDown" BufferOffset="50" Addr="50" Description="" />
       <DI_ITEM Index="51" Name="DI_ReactorSuspectorCheck" BufferOffset="51" Addr="51" Description="" />
-      <DI_ITEM Index="52" Name="DI_PMSO2DetectorAlarm" BufferOffset="52" Addr="52" Description="" />
+      <DI_ITEM Index="52" Name="DI_PMSO2Detector1SW" BufferOffset="52" Addr="52" Description="" />
       <DI_ITEM Index="55" Name="DI_GN2InletPressSW" BufferOffset="55" Addr="55" Description="" />
-      <DI_ITEM Index="56" Name="DI_GBH2SDetectorAlarm" BufferOffset="56" Addr="56" Description="" />
-      <DI_ITEM Index="57" Name="DI_H2PressureSW" BufferOffset="57" Addr="57" Description="" />
-      <DI_ITEM Index="58" Name="DI_GBSmokeDetectorAlarm" BufferOffset="58" Addr="58" Description="" />
+      <DI_ITEM Index="56" Name="DI_GBH2SDetectorSW" BufferOffset="56" Addr="56" Description="" />
+      <DI_ITEM Index="57" Name="DI_GBH2SeDetectorSW" BufferOffset="57" Addr="57" Description="" />
+      <DI_ITEM Index="58" Name="DI_GBSmokeDetectorSW" BufferOffset="58" Addr="58" Description="" />
       <DI_ITEM Index="59" Name="DI_GBH2DetectorSW" BufferOffset="59" Addr="59" Description="" />
       <DI_ITEM Index="60" Name="DI_GBWaterLeakSW" BufferOffset="60" Addr="60" Description="" />
-      <DI_ITEM Index="63" Name="DI_H2PressureAlarm" BufferOffset="63" Addr="63" Description="" />
+      <DI_ITEM Index="63" Name="DI_H2PressureSW" BufferOffset="63" Addr="63" Description="" />
       <DI_ITEM Index="65" Name="DI_DryPump1Running" BufferOffset="65" Addr="65" Description="" />
       <DI_ITEM Index="67" Name="DI_DryPump1Warning" BufferOffset="67" Addr="67" Description="" />
-      <DI_ITEM Index="69" Name="DI_PMSmokeDetectorAlarm" BufferOffset="69" Addr="69" Description="" />
-      <DI_ITEM Index="70" Name="DI_EMOStatusAlarm" BufferOffset="70" Addr="70" Description="" />
-      <DI_ITEM Index="71" Name="DI_PumpCabDoorCloseDone" BufferOffset="71" Addr="71" Description="" />
+      <DI_ITEM Index="69" Name="DI_PMSmokeDetectorSW" BufferOffset="69" Addr="69" Description="" />
+      <DI_ITEM Index="70" Name="DI_EMOStatusSW" BufferOffset="70" Addr="70" Description="" />
+      <DI_ITEM Index="71" Name="DI_PumpCabDoorClosed" BufferOffset="71" Addr="71" Description="" />
       <DI_ITEM Index="72" Name="DI_FacilityWarningSW" BufferOffset="72" Addr="72" Description="" />
+      <DI_ITEM Index="73" Name="DI_PMH2SDetector2SW" BufferOffset="73" Addr="73" Description="" />
+      <DI_ITEM Index="74" Name="DI_PMH2SeDetector2SW" BufferOffset="74" Addr="74" Description="" />
+      <DI_ITEM Index="75" Name="DI_PMSO2Detector2SW" BufferOffset="75" Addr="75" Description="" />
       <DI_ITEM Index="76" Name="DI_MainCBStatusSW" BufferOffset="76" Addr="76" Description="" />
       <DI_ITEM Index="77" Name="DI_PowerRackWaterLeakSW" BufferOffset="77" Addr="77" Description="" />
       <DI_ITEM Index="78" Name="DI_UPS1Enable" BufferOffset="78" Addr="78" Description="" />
@@ -139,7 +143,6 @@
       <DI_ITEM Index="201" Name="DI_FinalOuterGasFB(V88)" BufferOffset="201" Addr="201" Description="" />
       <DI_ITEM Index="202" Name="DI_SrcLeakTestPreFilterFB(V69)" BufferOffset="202" Addr="202" Description="" />
       <DI_ITEM Index="203" Name="DI_PMTMBalanceFB(V70)" BufferOffset="203" Addr="203" Description="" />
-      <DI_ITEM Index="204" Name="DI_EPV11FB(EPV1-1)" BufferOffset="204" Addr="204" Description="" />
       <DI_ITEM Index="205" Name="DI_VentGasDumpFB(V72)" BufferOffset="205" Addr="205" Description="" />
       <DI_ITEM Index="206" Name="DI_SrcLeakTestPrePumpFB(V73)" BufferOffset="206" Addr="206" Description="" />
       <DI_ITEM Index="207" Name="DI_GasboxLeakTestFB(V74)" BufferOffset="207" Addr="207" Description="" />
@@ -244,6 +247,7 @@
       <DI_ITEM Index="341" Name="DI_ConfinementRingOnDownPos" BufferOffset="341" Addr="341" Description="" />
       <DI_ITEM Index="342" Name="DI_ConfinementRingServoError" BufferOffset="342" Addr="342" Description="" />
       <DI_ITEM Index="344" Name="DI_InletTotalTempHighSW" BufferOffset="344" Addr="344" Description="" />
+      <DI_ITEM Index="345" Name="DI_ChamPressAboveATMSW2" BufferOffset="345" Addr="345" Description="" />
       <DI_ITEM Index="347" Name="DI_PMTMS7ComErr" BufferOffset="347" Addr="347" Description="" />
       <DI_ITEM Index="348" Name="DI_PMTMTCPComErr" BufferOffset="348" Addr="348" Description="" />
       <DI_ITEM Index="349" Name="DI_EtherCATcomError" BufferOffset="349" Addr="349" Description="" />
@@ -288,15 +292,15 @@
       <DI_ITEM Index="388" Name="DI_MFC38Offline" BufferOffset="388" Addr="388" Description="" />
       <DI_ITEM Index="389" Name="DI_MFC39Offline" BufferOffset="389" Addr="389" Description="" />
       <DI_ITEM Index="390" Name="DI_MFC40Offline" BufferOffset="390" Addr="390" Description="" />
-      <DI_ITEM Index="391" Name="DI_PC1Offline" BufferOffset="391" Addr="391" Description="" />
-      <DI_ITEM Index="392" Name="DI_PC2Offline" BufferOffset="392" Addr="392" Description="" />
-      <DI_ITEM Index="393" Name="DI_PC3Offline" BufferOffset="393" Addr="393" Description="" />
-      <DI_ITEM Index="394" Name="DI_PC4Offline" BufferOffset="394" Addr="394" Description="" />
-      <DI_ITEM Index="395" Name="DI_PC5Offline" BufferOffset="395" Addr="395" Description="" />
-      <DI_ITEM Index="396" Name="DI_PC6Offline" BufferOffset="396" Addr="396" Description="" />
-      <DI_ITEM Index="397" Name="DI_PC7Offline" BufferOffset="397" Addr="397" Description="" />
-      <DI_ITEM Index="398" Name="DI_PC8Offline" BufferOffset="398" Addr="398" Description="" />
-      <DI_ITEM Index="399" Name="DI_PC9Offline" BufferOffset="399" Addr="399" Description="" />
+      <DI_ITEM Index="391" Name="DI_PC01Offline" BufferOffset="391" Addr="391" Description="" />
+      <DI_ITEM Index="392" Name="DI_PC02Offline" BufferOffset="392" Addr="392" Description="" />
+      <DI_ITEM Index="393" Name="DI_PC03Offline" BufferOffset="393" Addr="393" Description="" />
+      <DI_ITEM Index="394" Name="DI_PC04Offline" BufferOffset="394" Addr="394" Description="" />
+      <DI_ITEM Index="395" Name="DI_PC05Offline" BufferOffset="395" Addr="395" Description="" />
+      <DI_ITEM Index="396" Name="DI_PC06Offline" BufferOffset="396" Addr="396" Description="" />
+      <DI_ITEM Index="397" Name="DI_PC07Offline" BufferOffset="397" Addr="397" Description="" />
+      <DI_ITEM Index="398" Name="DI_PC08Offline" BufferOffset="398" Addr="398" Description="" />
+      <DI_ITEM Index="399" Name="DI_PC09Offline" BufferOffset="399" Addr="399" Description="" />
       <DI_ITEM Index="400" Name="DI_PC10Offline" BufferOffset="400" Addr="400" Description="" />
     </Block>
   </Dig_In>
@@ -429,7 +433,7 @@
       <DO_ITEM Index="170" Name="DO_ReactorATMTransferReady" BufferOffset="170" Addr="170" Description="" />
       <DO_ITEM Index="171" Name="DO_ReactorVACTransferReady" BufferOffset="171" Addr="171" Description="" />
       <DO_ITEM Index="172" Name="DO_PurgeRoutineSuscessed" BufferOffset="172" Addr="172" Description="" />
-      <DO_ITEM Index="173" Name="DO_CleanRoutineSucceed" BufferOffset="173" Addr="173" Description="" />
+      <DO_ITEM Index="173" Name="DO_CleanRoutineSuscessed" BufferOffset="173" Addr="173" Description="" />
       <DO_ITEM Index="174" Name="DO_ProcessRunning" BufferOffset="174" Addr="174" Description="" />
       <DO_ITEM Index="175" Name="DO_PreprocessRunning" BufferOffset="175" Addr="175" Description="" />
       <DO_ITEM Index="176" Name="DO_CyclePurgeRoutineRunning" BufferOffset="176" Addr="176" Description="" />
diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs
index a61c020..2041339 100644
--- a/App/SicSimulator/Instances/SimulatorSystem.cs
+++ b/App/SicSimulator/Instances/SimulatorSystem.cs
@@ -101,7 +101,7 @@ namespace SicSimulator.Instances
             //SetWaterTemp(mod);
 
             IO.DI[$"{mod}.DI_ConfinementRingDone"].Value = true;
-            IO.DI[$"{mod}.DI_DryPump1Alarm"].Value = true;
+            IO.DI[$"{mod}.DI_DryPumpAlarm"].Value = true;
             IO.DI[$"{mod}.DI_DryPump1Warning"].Value = true;
             IO.DI[$"{mod}.DI_DryPump1Running"].Value = true;
 
@@ -112,10 +112,11 @@ namespace SicSimulator.Instances
             IO.DI[$"{mod}.DI_EPV2FB"].Value = true;
 
             IO.DI[$"{mod}.DI_ChamPressAboveATMSW"].Value = true;
-            IO.DI[$"{mod}.DI_HeaterTempUpLimitAlarm"].Value = false;
+            IO.DI[$"{mod}.DI_HeaterTempUpLimitSW"].Value = false;
             IO.DI[$"{mod}.DI_ChamTopFlowSW"].Value = true;
             IO.DI[$"{mod}.DI_DryPump1Running"].Value = true;
 
+
             IO.DI[$"{mod}.DI_ChamLidPushButtonLocal"].Value = true;
             IO.DI[$"{mod}.DI_ChamMoveBodyDown"].Value = true;
             IO.DI[$"{mod}.DI_ChamMoveBodyFront"].Value = true;
@@ -130,6 +131,7 @@ namespace SicSimulator.Instances
             IO.DI[$"{mod}.DI_SHLidSwingLock"].Value = true;
             IO.DI[$"{mod}.DI_MiddleLidSwingLock"].Value = true;
 
+
             IO.DI[$"{mod}.DI_SHGasConnectorLoosen"].Value = false;
             IO.DI[$"{mod}.DI_SHGasConnectorTighten"].Value = true;
             IO.DO[$"{mod}.DO_CleanRoutineSucceed"].Value = true;
@@ -138,7 +140,7 @@ namespace SicSimulator.Instances
             IO.AO[$"{mod}.AO_ValveModeSetpoint"].Value = (float)2;
 
             IO.DI[$"{mod}.DI_ChamLidClosed"].Value = true;
-            //IO.DI[$"{mod}.DI_ChamCabDoorClosed"].Value = true;
+            IO.DI[$"{mod}.DI_ChamCabDoorClosed"].Value = true;
             IO.DI[$"{mod}.DI_ChamPressAboveATMSW"].Value = true;
             IO.DI[$"{mod}.DI_ChamAtSafeProcessPressSW"].Value = false;
             IO.DI[$"{mod}.DI_DORPressVacSW"].Value = true;
@@ -146,7 +148,7 @@ namespace SicSimulator.Instances
             IO.DI[$"{mod}.DI_HeaterTempLowLimitSW"].Value = true;
             IO.DI[$"{mod}.DI_ConfinementRingUp"].Value = true;
             IO.DI[$"{mod}.DI_ConfinementRingDown"].Value = false;
-            
+            IO.DI[$"{mod}.DI_SHFlowSW"].Value = true;
             IO.DI[$"{mod}.DI_ChamTopFlowSW"].Value = true;
             IO.DI[$"{mod}.DI_ChamMiddleFlow1SW"].Value = true;
             IO.DI[$"{mod}.DI_ChamBottomFlowSW"].Value = true;
@@ -158,7 +160,7 @@ namespace SicSimulator.Instances
             IO.DI[$"{mod}.DI_Foreline1FlowSW"].Value = true;
             IO.DI[$"{mod}.DI_TransformerFlowSW"].Value = true;
             IO.DI[$"{mod}.DI_GBH2DetectorSW"].Value = true;
-            
+            IO.DI[$"{mod}.DI_GBHCLDetectorSW"].Value = true;
             IO.DI[$"{mod}.DI_GBDoorClosed"].Value = true;
             IO.DI[$"{mod}.DI_PumpExhaustPressSW"].Value = true;
             IO.DI[$"{mod}.DI_PMATMSW"].Value = true;
@@ -166,6 +168,7 @@ namespace SicSimulator.Instances
             IO.DI[$"{mod}.DI_FacilityIntlkSW"].Value = true;
             IO.DI[$"{mod}.DI_PowerRackWaterLeakSW"].Value = true;
 
+
             #region TC
 
             //IO.AI[$"{mod}.AI_L1WorkingOP"].Value = 10;
@@ -239,8 +242,7 @@ namespace SicSimulator.Instances
             //IO.AO[$"{mod}.AO_L1TempLowLimit2"].Value = 80;
             //IO.AO[$"{mod}.AO_L2TempLowLimit2"].Value = 80;
             //IO.AO[$"{mod}.AO_L3TempLowLimit2"].Value = 80;
-
-            #endregion TC
+            #endregion
 
             IO.DI[$"{mod}.DI_PMH2DetectorSW"].Value = true;
             IO.DI[$"{mod}.DI_ProcessStopSW"].Value = false;
@@ -250,19 +252,24 @@ namespace SicSimulator.Instances
             IO.DI[$"{mod}.DI_ReactorWaterLeakSW"].Value = true;
             IO.DI[$"{mod}.DI_ChamMiddleFlow1SW"].Value = true;
             IO.DI[$"{mod}.DI_ChamMiddleFlow2SW"].Value = true;
-
+            IO.DI[$"{mod}.DI_PumpExhaustDPSW"].Value = true;
+            IO.DI[$"{mod}.DI_Spare2FlowSW"].Value = true;
+            IO.DI[$"{mod}.DI_Spare1FlowSW"].Value = true;
 
             IO.DI[$"{mod}.DI_H2PressureSW"].Value = true;
-
+            IO.DI[$"{mod}.DI_TCSAlarm"].Value = true;
             IO.DI[$"{mod}.DI_GBExhaustDPSW"].Value = true;
             IO.DI[$"{mod}.DI_PMAExhaustDPSW"].Value = true;
-            
+            IO.DI[$"{mod}.DI_ServoDriverFaultSW"].Value = true;
+
+            IO.DI[$"{mod}.DI_ServoDriverFaultSW"].Value = true;
 
             IO.DI[$"{mod}.DI_GN2InletPressSW"].Value = true;
             IO.DI[$"{mod}.DI_ArInletPressSW"].Value = true;
             IO.DI[$"{mod}.DI_FacilityWarningSW"].Value = true;
 
-
+            IO.DI[$"{mod}.DI_GBNH3DetectorSW"].Value = true;
+            IO.DI[$"{mod}.DI_PMNH3DetectorSW"].Value = true;
 
             //IO.DI[$"{mod}.DI_InletTotalTempHighSW"].Value = true;
             //IO.DI[$"{mod}.DI_DryPumpFlowSW"].Value = true;
@@ -337,7 +344,7 @@ namespace SicSimulator.Instances
                 MonitorValve("PM1");
                 //MonitorValve("PM2");
 
-                MonitorFlowRamp("PM1");
+                //MonitorFlowRamp("PM1");
                 //MonitorFlowRamp("PM2");
                 //MonitorGasConnector("PM1");
                 //MonitorLid("PM1");