diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
index 4efbc99..cef5921 100644
--- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
@@ -456,7 +456,7 @@
     <IoSensor id="SensorScrubberIntlkSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_ScrubberIntlkSW" infoText="" warningText="" alarmText="Alarm27  Scrubber System Error  [DI-41]" />
     <IoSensor id="SensorFacilityIntlkSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_FacilityIntlkSW" infoText="" warningText="" alarmText="Alarm28  Facility Error  [DI-42]" />
     <IoSensor id="SensorPMH2SeDetector2SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMH2SeDetector2SW" infoText="" warningText="" alarmText="Alarm29  PMH2Se Leak Detect2  [DI-43]" />
-    <IoSensor id="SensorPMSO2Detector2SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMSO2Detector2SW" infoText="" warningText="" alarmText="Alarm30  PMSO2 Leak Detect2  [DI-43]" />
+    <IoSensor id="SensorPMSO2Detector2SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMSO2Detector2SW" infoText="" warningText="" alarmText="Alarm30  PMSO2 Leak Detect2  [DI-44]" />
     <IoSensor id="SensorServoDriverFaultSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_ServoDriverFaultSW" infoText="" warningText="" alarmText="Alarm31  Rotation Servo Driver Error  [DI-45]" />
     <IoSensor id="SensorChamMiddleFlow2SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_ChamMiddleFlow2SW" infoText="" warningText="" alarmText="Alarm32 Chamber Middle2 Cooling Water Flow Abnormal U4[DI-46]" />
     <IoSensor id="SensorSpare2FlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_Spare2FlowSW" infoText="" warningText="Warning8  Spare2 Flow Low  -U13 [DI-47]" alarmText="" />
@@ -465,7 +465,7 @@
     <IoSensor id="SensorConfinementRingDown" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_ConfinementRingDown" infoText="Information8 Confinement Ring At Down position [DI-50]" warningText="" alarmText="" />
     <IoSensor id="SensorPMGasDetectorFault2SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMGasDetectorFault2SW" infoText="" warningText="" alarmText="Alarm33  PMGasDetectorFault2 [DI-51]" />
     <IoSensor id="SensorPMSO2Detector1SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMSO2Detector1SW" infoText="" warningText="" alarmText="Alarm34  PMSO2Leak Detect1  [DI-52]" />
-    <IoSensor id="SensorGN2InletPressSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_GN2InletPressSW" infoText="" warningText="" alarmText="Alarm35  Gasbox N2 Pressure Low  [DI-55]" />
+    <IoSensor id="SensorGN2InletPressSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GN2InletPressSW" infoText="" warningText="" alarmText="Alarm35  Gasbox N2 Pressure Low  [DI-55]" />
     <IoSensor id="SensorGBH2SDetectorSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GBH2SDetectorSW" infoText="" warningText="" alarmText="Alarm36  GBH2S Leak Detect1  [DI-56]" />
     <IoSensor id="SensorGBH2SeDetectorSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GBH2SeDetectorSW" infoText="" warningText="" alarmText="Alarm37  GBH2Se Leak Detect1  [DI-57]" />
     <IoSensor id="SensorGBSmokeDetectorSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GBSmokeDetectorSW" infoText="" warningText="" alarmText="Alarm38  GBSmokeDetector  [DI-58]" />
diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs
index 01ee02c..6e68a47 100644
--- a/App/SicSimulator/Instances/SimulatorSystem.cs
+++ b/App/SicSimulator/Instances/SimulatorSystem.cs
@@ -288,35 +288,53 @@ namespace SicSimulator.Instances
 
             IO.DO[$"{mod}.DO_ChamBottomFlowTemp"].Value = true;
 
+            IO.DO[$"{mod}.DO_Foreline1FlowTemp"].Value = true;
             IO.DO[$"{mod}.DO_PowerRod1FlowTemp"].Value = true;
             IO.DO[$"{mod}.DO_PowerRod2FlowTemp"].Value = true;
             IO.DO[$"{mod}.DO_ElectrodeWFlowTemp"].Value = true;
+            IO.DO[$"{mod}.DO_Foreline2FlowTemp"].Value = true;
 
             IO.DO[$"{mod}.DO_TransformerFlowTemp"].Value = true;
 
             IO.DO[$"{mod}.DO_HeaterEnable"].Value = true;
             IO.DO[$"{mod}.DO_EPV2"].Value = true;
 
+            IO.DI[$"{mod}.DI_PMGasDetectorSW"].Value = true;
+            IO.DI[$"{mod}.DI_GBGasDetectorSW"].Value = true;
+
+            IO.DI[$"{mod}.DI_PMH2SDetector1SW"].Value = true;
+            IO.DI[$"{mod}.DI_PMH2SeDetector1SW"].Value = true;
+            IO.DI[$"{mod}.DI_PMH2SeDetector2SW"].Value = true;
+            IO.DI[$"{mod}.DI_PMSO2Detector2SW"].Value = true;
+            IO.DI[$"{mod}.DI_PMGasDetectorFault2SW"].Value = true;
+            IO.DI[$"{mod}.DI_PMSO2Detector1SW"].Value = true;
+            IO.DI[$"{mod}.DI_PMH2SDetector2SW"].Value = true;
+
+            IO.DI[$"{mod}.DI_GN2InletPressSW"].Value = true;
+            IO.DI[$"{mod}.DI_GBH2SDetectorSW"].Value = true;
+            IO.DI[$"{mod}.DI_GBH2SeDetectorSW"].Value = true;
+            IO.DI[$"{mod}.DI_PMSmokeDetectorSW"].Value = true;
+
         }
 
         private void SetWaterTemp(string mod)
         {
             #region Water Flow
 
-            IO.AI[$"{mod}.AI_ChamMiddleFlow2Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_SHFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_ChamTopFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_ChamMiddleFlow1Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_ChamBottomFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_Foreline2FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_PowerRod1FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_PowerRod2FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_Foreline1FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_ElectrodeWFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_TMPump1FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_TransformerFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_Spare1Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_Spare2Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_ChamMiddleFlow2Temp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_SHFlowTemp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_ChamTopFlowTemp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_ChamMiddleFlow1Temp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_ChamBottomFlowTemp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_Foreline2FlowTemp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_PowerRod1FlowTemp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_PowerRod2FlowTemp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_Foreline1FlowTemp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_ElectrodeWFlowTemp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_TMPump1FlowTemp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_TransformerFlowTemp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_Spare1Temp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_Spare2Temp"].Value = (float)(WaterTempBase + _rnd.NextDouble()); ;
             //IO.AI[$"{mod}.AI_SpareFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
 
             #endregion Water Flow