diff --git a/PLC/UDTs/STATION_EPC_DataTypes.L5X b/PLC/UDTs/STATION_EPC_DataTypes.L5X
index 1a51d6a..ba477bc 100644
--- a/PLC/UDTs/STATION_EPC_DataTypes.L5X
+++ b/PLC/UDTs/STATION_EPC_DataTypes.L5X
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<RSLogix5000Content SchemaRevision="1.0" SoftwareRevision="36.00" TargetName="UDT_ALARMS_STATION" TargetType="DataType" ContainsContext="true" ExportDate="Wed Jul 23 13:31:38 2025" ExportOptions="References NoRawData L5KData DecoratedData Context Dependencies ForceProtectedEncoding AllProjDocTrans">
+<RSLogix5000Content SchemaRevision="1.0" SoftwareRevision="36.00" TargetName="UDT_ALARMS_STATION" TargetType="DataType" ContainsContext="true" ExportDate="Mon Jul 28 15:57:04 2025" ExportOptions="References NoRawData L5KData DecoratedData Context Dependencies ForceProtectedEncoding AllProjDocTrans">
 <Controller Use="Context" Name="MTN6_MCM01">
 <DataTypes Use="Context">
 <DataType Name="UDT_CTRL_MCM" Family="NoFamily" Class="User">
@@ -203,7 +203,7 @@
 </DataType>
 </DataTypes>
 <AddOnInstructionDefinitions Use="Context">
-<AddOnInstructionDefinition Name="AOI_FLIP_FLOP" Class="Standard" Revision="1.0" ExecutePrescan="false" ExecutePostscan="false" ExecuteEnableInFalse="false" CreatedDate="2022-03-10T21:16:26.590Z" CreatedBy="DESKTOP-T9CCJM5\autStand" EditedDate="2025-05-21T10:05:03.350Z" EditedBy="LCIBATUMI\ilia.gurielidze" SoftwareRevision="v36.00"
+<AddOnInstructionDefinition Name="AOI_FLIP_FLOP" Class="Standard" Revision="1.0" ExecutePrescan="false" ExecutePostscan="false" ExecuteEnableInFalse="false" CreatedDate="2022-03-10T21:16:26.590Z" CreatedBy="DESKTOP-T9CCJM5\autStand" EditedDate="2025-07-21T10:35:04.128Z" EditedBy="AzureAD\RobertYevdokimov" SoftwareRevision="v36.00"
 >
 <Parameters>
 <Parameter Name="EnableIn" TagType="Base" DataType="BOOL" Usage="Input" Radix="Decimal" Required="false" Visible="false" ExternalAccess="Read Only">
@@ -281,22 +281,30 @@
 <Routine Name="Logic" Type="RLL">
 <RLLContent>
 <Rung Number="0" Type="N">
+<Comment>
+<![CDATA[Toggles EnableOut at the intervas set by On and Off]]>
+</Comment>
 <Text>
-<![CDATA[MOVE(On,Flip.PRE)MOVE(Off,Flop.PRE);]]>
+<![CDATA[NOP();]]>
 </Text>
 </Rung>
 <Rung Number="1" Type="N">
 <Text>
-<![CDATA[XIO(Flop.DN)TON(Flip,?,?);]]>
+<![CDATA[MOVE(On,Flip.PRE)MOVE(Off,Flop.PRE);]]>
 </Text>
 </Rung>
 <Rung Number="2" Type="N">
 <Text>
-<![CDATA[XIC(Flip.DN)TON(Flop,?,?);]]>
+<![CDATA[XIO(Flop.DN)TON(Flip,?,?);]]>
 </Text>
 </Rung>
 <Rung Number="3" Type="N">
 <Text>
+<![CDATA[XIC(Flip.DN)TON(Flop,?,?);]]>
+</Text>
+</Rung>
+<Rung Number="4" Type="N">
+<Text>
 <![CDATA[XIC(Flip.DN)OTE(Flash)OTE(EnableOut);]]>
 </Text>
 </Rung>
@@ -304,7 +312,7 @@
 </Routine>
 </Routines>
 </AddOnInstructionDefinition>
-<AddOnInstructionDefinition Name="AOI_STATION_EPC" Class="Standard" Revision="1.0" Vendor="Automation Standard" ExecutePrescan="true" ExecutePostscan="false" ExecuteEnableInFalse="false" CreatedDate="2012-02-01T16:00:09.261Z" CreatedBy="Not Available" EditedDate="2025-07-18T12:06:45.173Z" EditedBy="LCIBATUMI\ilia.gurielidze"
+<AddOnInstructionDefinition Name="AOI_STATION_EPC" Class="Standard" Revision="1.0" Vendor="Automation Standard" ExecutePrescan="true" ExecutePostscan="false" ExecuteEnableInFalse="false" CreatedDate="2012-02-01T16:00:09.261Z" CreatedBy="Not Available" EditedDate="2025-07-28T11:56:31.601Z" EditedBy="LCIBATUMI\beka.makharadze"
  SoftwareRevision="v36.00">
 <Description>
 <![CDATA[EMERGENSY STOP STATION PUSH BUTTON]]>
@@ -448,31 +456,44 @@
 <Routine Name="Logic" Type="RLL">
 <RLLContent>
 <Rung Number="0" Type="N">
+<Comment>
+<![CDATA[Emergency Pullcord – Drops out VFD STO and Turns on Beacon
+
+The actual saftey logic is located in the Saftey Task, this AOI handles coordinating the states of the lights for devices associated when an e-stop condition has been triggered.
+
+Affected devices included the MCM and Station used to reset the e-stop condition
+]]>
+</Comment>
 <Text>
-<![CDATA[[XIO(EStop_Ch1_I) ,XIO(EStop_Ch2_I) ]XIO(Parent_Comm_Faulted)OTL(Station.CMD.EStop_Actuated)OTL(Estop_Was_Actuated)OTL(MCM.CMD.EStop_Actuated)OTE(EStop_Actuated);]]>
+<![CDATA[NOP();]]>
 </Text>
 </Rung>
 <Rung Number="1" Type="N">
 <Text>
-<![CDATA[XIO(Station.STS.EStop_Was_Actuated)OTU(Estop_Was_Actuated);]]>
+<![CDATA[[XIO(EStop_Ch1_I) ,XIO(EStop_Ch2_I) ]XIO(Parent_Comm_Faulted)OTL(Station.CMD.EStop_Actuated)OTL(Estop_Was_Actuated)OTL(MCM.CMD.EStop_Actuated)OTE(EStop_Actuated);]]>
 </Text>
 </Rung>
 <Rung Number="2" Type="N">
 <Text>
-<![CDATA[XIO(Estop_Was_Actuated)[ONS(Beacon_ONS) OTU(Beacon_Light_O) ,JMP(JMP) ];]]>
+<![CDATA[XIO(Station.STS.EStop_Was_Actuated)OTU(Estop_Was_Actuated);]]>
 </Text>
 </Rung>
 <Rung Number="3" Type="N">
 <Text>
-<![CDATA[[XIC(EStop_Actuated) AOI_FLIP_FLOP(Flip_Flop,500,500) ,XIC(Station.STS.EStop_Was_Actuated) XIO(EStop_Actuated) ]OTE(Beacon_Light_O);]]>
+<![CDATA[XIO(Estop_Was_Actuated)[ONS(Beacon_ONS) OTU(Beacon_Light_O) ,JMP(JMP) ];]]>
 </Text>
 </Rung>
 <Rung Number="4" Type="N">
 <Text>
-<![CDATA[LBL(JMP)NOP();]]>
+<![CDATA[[XIC(EStop_Actuated) AOI_FLIP_FLOP(Flip_Flop,500,500) ,XIC(Station.STS.EStop_Was_Actuated) XIO(EStop_Actuated) ]OTE(Beacon_Light_O);]]>
 </Text>
 </Rung>
 <Rung Number="5" Type="N">
+<Text>
+<![CDATA[LBL(JMP)NOP();]]>
+</Text>
+</Rung>
+<Rung Number="6" Type="N">
 <Comment>
 <![CDATA[ALARM
 ]]>
@@ -481,7 +502,7 @@
 <![CDATA[XIC(EStop_Actuated)OTE(HMI.Alarm.EStopped);]]>
 </Text>
 </Rung>
-<Rung Number="6" Type="N">
+<Rung Number="7" Type="N">
 <Comment>
 <![CDATA[Colors of Animation
 ]]>
@@ -490,16 +511,16 @@
 <![CDATA[NOP();]]>
 </Text>
 </Rung>
-<Rung Number="7" Type="N">
+<Rung Number="8" Type="N">
 <Comment>
 <![CDATA[Conveyor Running - Green (0.255.0)
 ]]>
 </Comment>
 <Text>
-<![CDATA[MOVE(2,HMI.STATE);]]>
+<![CDATA[MOVE(0,HMI.STATE);]]>
 </Text>
 </Rung>
-<Rung Number="8" Type="N">
+<Rung Number="9" Type="N">
 <Comment>
 <![CDATA[EStop Actuated - Red (255.0.0)
 ]]>
@@ -508,12 +529,12 @@
 <![CDATA[XIC(EStop_Actuated)MOVE(1,HMI.STATE);]]>
 </Text>
 </Rung>
-<Rung Number="9" Type="N">
+<Rung Number="10" Type="N">
 <Text>
 <![CDATA[XIC(MCM.STS.Unacknowledge_All_Logs)OTU(Acknowledge);]]>
 </Text>
 </Rung>
-<Rung Number="10" Type="N">
+<Rung Number="11" Type="N">
 <Text>
 <![CDATA[[XIC(EStop_Actuated) ONS(Acknowledge_ONS) OTU(Acknowledge) ,XIC(EStop_Actuated) [XIO(Acknowledge) MOVE(' TRIPPED',Concatenated_String) CONCAT(HMI.Name,Concatenated_String,MCM.CMD.Log) ADD(MCM.CMD.Log_Quantity,1,MCM.CMD.Log_Quantity) ,MOVE(' TRIPPED',Concatenated_String) CONCAT(HMI.Name,Concatenated_String,Station.CMD.Log) ] ,NE(MCM.STS.Acknowledge_Log,'') EQ(MCM.CMD.Log,MCM.STS.Acknowledge_Log) OTL(Acknowledge) MOVE('',MCM.STS.Acknowledge_Log) ];]]>
 </Text>
diff --git a/PLC/UDTs/STATION_S_DataTypes.L5X b/PLC/UDTs/STATION_S_DataTypes.L5X
index 37c1456..6201859 100644
--- a/PLC/UDTs/STATION_S_DataTypes.L5X
+++ b/PLC/UDTs/STATION_S_DataTypes.L5X
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<RSLogix5000Content SchemaRevision="1.0" SoftwareRevision="36.00" TargetName="UDT_ALARMS_STATION" TargetType="DataType" ContainsContext="true" ExportDate="Wed Jul 23 13:32:03 2025" ExportOptions="References NoRawData L5KData DecoratedData Context Dependencies ForceProtectedEncoding AllProjDocTrans">
+<RSLogix5000Content SchemaRevision="1.0" SoftwareRevision="36.00" TargetName="UDT_ALARMS_STATION" TargetType="DataType" ContainsContext="true" ExportDate="Mon Jul 28 15:54:12 2025" ExportOptions="References NoRawData L5KData DecoratedData Context Dependencies ForceProtectedEncoding AllProjDocTrans">
 <Controller Use="Context" Name="MTN6_MCM01">
 <DataTypes Use="Context">
 <DataType Name="UDT_CTRL_VFD" Family="NoFamily" Class="User">
@@ -338,7 +338,7 @@ Stopped by Station Stop PushButton]]>
 </DataType>
 </DataTypes>
 <AddOnInstructionDefinitions Use="Context">
-<AddOnInstructionDefinition Name="AOI_FLIP_FLOP" Class="Standard" Revision="1.0" ExecutePrescan="false" ExecutePostscan="false" ExecuteEnableInFalse="false" CreatedDate="2022-03-10T21:16:26.590Z" CreatedBy="DESKTOP-T9CCJM5\autStand" EditedDate="2025-05-21T10:05:03.350Z" EditedBy="LCIBATUMI\ilia.gurielidze" SoftwareRevision="v36.00"
+<AddOnInstructionDefinition Name="AOI_FLIP_FLOP" Class="Standard" Revision="1.0" ExecutePrescan="false" ExecutePostscan="false" ExecuteEnableInFalse="false" CreatedDate="2022-03-10T21:16:26.590Z" CreatedBy="DESKTOP-T9CCJM5\autStand" EditedDate="2025-07-21T10:35:04.128Z" EditedBy="AzureAD\RobertYevdokimov" SoftwareRevision="v36.00"
 >
 <Parameters>
 <Parameter Name="EnableIn" TagType="Base" DataType="BOOL" Usage="Input" Radix="Decimal" Required="false" Visible="false" ExternalAccess="Read Only">
@@ -416,22 +416,30 @@ Stopped by Station Stop PushButton]]>
 <Routine Name="Logic" Type="RLL">
 <RLLContent>
 <Rung Number="0" Type="N">
+<Comment>
+<![CDATA[Toggles EnableOut at the intervas set by On and Off]]>
+</Comment>
 <Text>
-<![CDATA[MOVE(On,Flip.PRE)MOVE(Off,Flop.PRE);]]>
+<![CDATA[NOP();]]>
 </Text>
 </Rung>
 <Rung Number="1" Type="N">
 <Text>
-<![CDATA[XIO(Flop.DN)TON(Flip,?,?);]]>
+<![CDATA[MOVE(On,Flip.PRE)MOVE(Off,Flop.PRE);]]>
 </Text>
 </Rung>
 <Rung Number="2" Type="N">
 <Text>
-<![CDATA[XIC(Flip.DN)TON(Flop,?,?);]]>
+<![CDATA[XIO(Flop.DN)TON(Flip,?,?);]]>
 </Text>
 </Rung>
 <Rung Number="3" Type="N">
 <Text>
+<![CDATA[XIC(Flip.DN)TON(Flop,?,?);]]>
+</Text>
+</Rung>
+<Rung Number="4" Type="N">
+<Text>
 <![CDATA[XIC(Flip.DN)OTE(Flash)OTE(EnableOut);]]>
 </Text>
 </Rung>
@@ -439,7 +447,7 @@ Stopped by Station Stop PushButton]]>
 </Routine>
 </Routines>
 </AddOnInstructionDefinition>
-<AddOnInstructionDefinition Name="AOI_STATION_S_PB" Class="Standard" Revision="1.0" Vendor="Automation Standard" ExecutePrescan="true" ExecutePostscan="false" ExecuteEnableInFalse="false" CreatedDate="2012-02-01T16:00:09.261Z" CreatedBy="Not Available" EditedDate="2025-07-18T12:05:45.199Z" EditedBy="LCIBATUMI\ilia.gurielidze"
+<AddOnInstructionDefinition Name="AOI_STATION_S_PB" Class="Standard" Revision="1.0" Vendor="Automation Standard" ExecutePrescan="true" ExecutePostscan="false" ExecuteEnableInFalse="false" CreatedDate="2012-02-01T16:00:09.261Z" CreatedBy="Not Available" EditedDate="2025-07-28T11:36:13.489Z" EditedBy="LCIBATUMI\beka.makharadze"
  SoftwareRevision="v36.00">
 <Parameters>
 <Parameter Name="EnableIn" TagType="Base" DataType="BOOL" Usage="Input" Radix="Decimal" Required="false" Visible="false" ExternalAccess="Read Only"/>
@@ -534,36 +542,51 @@ Stopped by Station Stop PushButton]]>
 <Routine Name="Logic" Type="RLL">
 <RLLContent>
 <Rung Number="0" Type="N">
+<Comment>
+<![CDATA[Station Start Push-Button
+
+Handles restarting e-stop conditions
+
+This station contains a light that reflects the state of e-stop condition and power saving modes.
+
+Similar to the start-stop pushbutton but without the stop button
+]]>
+</Comment>
 <Text>
-<![CDATA[COP(CTRL.CMD.Log,CTRL.STS.Log,1);]]>
+<![CDATA[NOP();]]>
 </Text>
 </Rung>
 <Rung Number="1" Type="N">
 <Text>
-<![CDATA[XIC(CTRL.CMD.EStop_Actuated)OTL(CTRL.STS.EStop_Was_Actuated);]]>
+<![CDATA[COP(CTRL.CMD.Log,CTRL.STS.Log,1);]]>
 </Text>
 </Rung>
 <Rung Number="2" Type="N">
 <Text>
-<![CDATA[[XIC(Start_PB_I) ,XIC(VFD.STS.MCM_Start_PB_Pressed) ]OTU(CTRL.STS.EStop_Was_Actuated);]]>
+<![CDATA[XIC(CTRL.CMD.EStop_Actuated)OTL(CTRL.STS.EStop_Was_Actuated);]]>
 </Text>
 </Rung>
 <Rung Number="3" Type="N">
 <Text>
-<![CDATA[[XIO(VFD.STS.In_Power_Saving_Mode) XIC(VFD.STS.Enabled) ,XIO(VFD.STS.MCM_EStop_PB_Pressed) XIO(CTRL.CMD.EStop_Actuated) XIC(CTRL.STS.EStop_Was_Actuated) AOI_FLIP_FLOP(Flip_Flop_100,100,100) ,XIC(VFD.STS.In_Power_Saving_Mode) XIO(CTRL.STS.EStop_Was_Actuated) AOI_FLIP_FLOP(Flip_Flop_1000,1000,1000) ]OTE(Start_PB_LT_O);]]>
+<![CDATA[[XIC(Start_PB_I) ,XIC(VFD.STS.MCM_Start_PB_Pressed) ]OTU(CTRL.STS.EStop_Was_Actuated);]]>
 </Text>
 </Rung>
 <Rung Number="4" Type="N">
 <Text>
-<![CDATA[[XIC(Start_PB_I) ,XIC(HMI.Start_PB) ,XIC(VFD.STS.MCM_Start_PB_Pressed) ][OTE(CTRL.STS.Start) ,OTL(VFD.CMD.Start) ];]]>
+<![CDATA[[XIO(VFD.STS.In_Power_Saving_Mode) XIC(VFD.STS.Enabled) ,XIO(VFD.STS.MCM_EStop_PB_Pressed) XIO(CTRL.CMD.EStop_Actuated) XIC(CTRL.STS.EStop_Was_Actuated) AOI_FLIP_FLOP(Flip_Flop_100,100,100) ,XIC(VFD.STS.In_Power_Saving_Mode) XIO(CTRL.STS.EStop_Was_Actuated) AOI_FLIP_FLOP(Flip_Flop_1000,1000,1000) ]OTE(Start_PB_LT_O);]]>
 </Text>
 </Rung>
 <Rung Number="5" Type="N">
 <Text>
-<![CDATA[[XIC(Start_PB_I) ,XIC(HMI.Stop_PB) ]MOVE(2,HMI.Alarm.Pressed);]]>
+<![CDATA[[XIC(Start_PB_I) ,XIC(HMI.Start_PB) ,XIC(VFD.STS.MCM_Start_PB_Pressed) ][OTE(CTRL.STS.Start) ,OTL(VFD.CMD.Start) ];]]>
 </Text>
 </Rung>
 <Rung Number="6" Type="N">
+<Text>
+<![CDATA[[XIC(Start_PB_I) ,XIC(HMI.Start_PB) ]MOVE(1,HMI.Alarm.Pressed);]]>
+</Text>
+</Rung>
+<Rung Number="7" Type="N">
 <Comment>
 <![CDATA[STATE
 ]]>
@@ -572,33 +595,33 @@ Stopped by Station Stop PushButton]]>
 <![CDATA[NOP();]]>
 </Text>
 </Rung>
-<Rung Number="7" Type="N">
-<Text>
-<![CDATA[XIO(Start_PB_LT_O)MOVE(1,HMI.STATE);]]>
-</Text>
-</Rung>
 <Rung Number="8" Type="N">
 <Text>
-<![CDATA[XIO(Start_PB_LT_O)[XIC(Start_PB_I) ,XIC(HMI.Start_PB) ]MOVE(2,HMI.STATE);]]>
+<![CDATA[XIO(Start_PB_LT_O)MOVE(0,HMI.STATE);]]>
 </Text>
 </Rung>
 <Rung Number="9" Type="N">
 <Text>
-<![CDATA[XIC(Start_PB_LT_O)MOVE(3,HMI.STATE);]]>
+<![CDATA[XIO(Start_PB_LT_O)[XIC(Start_PB_I) ,XIC(HMI.Start_PB) ]MOVE(1,HMI.STATE);]]>
 </Text>
 </Rung>
 <Rung Number="10" Type="N">
 <Text>
-<![CDATA[XIC(Start_PB_LT_O)[XIC(Start_PB_I) ,XIC(HMI.Start_PB) ]MOVE(4,HMI.STATE);]]>
+<![CDATA[XIC(Start_PB_LT_O)MOVE(2,HMI.STATE);]]>
 </Text>
 </Rung>
 <Rung Number="11" Type="N">
 <Text>
-<![CDATA[NOP();]]>
+<![CDATA[XIC(Start_PB_LT_O)[XIC(Start_PB_I) ,XIC(HMI.Start_PB) ]MOVE(3,HMI.STATE);]]>
 </Text>
 </Rung>
 <Rung Number="12" Type="N">
 <Text>
+<![CDATA[NOP();]]>
+</Text>
+</Rung>
+<Rung Number="13" Type="N">
+<Text>
 <![CDATA[OTU(HMI.Start_PB)OTU(CTRL.CMD.EStop_Actuated)COP(Empty_String,CTRL.CMD.Log,1)MOVE(0,HMI.Alarm.Pressed);]]>
 </Text>
 </Rung>