diff --git a/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_Panel.TcPOU
similarity index 71%
rename from solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU
rename to solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_Panel.TcPOU
index 5dc18c1..d8fcf84 100644
--- a/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU
+++ b/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_Panel.TcPOU
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TcPlcObject Version="1.1.0.1">
-  <POU Name="Shutter_Operator_panel_Template" Id="{09741edf-58a0-0d9d-0563-de91fec8904d}" SpecialFunc="None">
-    <Declaration><![CDATA[PROGRAM Shutter_Operator_panel_Template
+  <POU Name="Shutter_Operator_Panel" Id="{09741edf-58a0-0d9d-0563-de91fec8904d}" SpecialFunc="None">
+    <Declaration><![CDATA[PROGRAM Shutter_Operator_Panel
 VAR
     //Variables used to control the LEDs of the Safety Shutter Operator panel
 (*
@@ -12,7 +12,7 @@ VAR
     {attribute 'TcLinkTo' := 'TIID^Device 1 (EtherCAT)^KF201 (EK1200)^KF217 (EK1521)^KF01 (EK1501-0100)^KF03 (EL2014)^DIG Outputs^Channel 2^Output'}
     bMovingLight AT %Q*: BOOL; //Power output for cylinder Moving LED
     {attribute 'TcLinkTo' := 'TIID^Device 1 (EtherCAT)^KF201 (EK1200)^KF217 (EK1521)^KF01 (EK1501-0100)^KF04 (EL2014)^DIG Outputs^Channel 1^Output'}
-    bNoPermitLight AT %Q*: BOOL; //Power output for No permit LED
+    bPermitLight AT %Q*: BOOL; //Power output for PSS permit LED
     {attribute 'TcLinkTo' := 'TIID^Device 1 (EtherCAT)^KF201 (EK1200)^KF217 (EK1521)^KF01 (EK1501-0100)^KF04 (EL2014)^DIG Outputs^Channel 2^Output'}
     bErrorLight AT %Q*: BOOL; //Power output for Error LED
 *)
@@ -22,17 +22,17 @@ END_VAR
       <ST><![CDATA[//Uncomment the code, it is needed to control the LEDs of the Safety Shutter Operator panel
 (*
 //Assign LED to the permit status
-bNoPermitLight := GVL.astPneumaticAxes[x].stPneumaticAxisStatus.bPSSPermit;
+bPermitLight := GVL.astPneumaticAxes[1].stPneumaticAxisStatus.bPSSPermitOK;
 
 //Assign LED to the error status
-bErrorLight := GVL.astPneumaticAxes[x].stPneumaticAxisStatus.bError;
+bErrorLight := GVL.astPneumaticAxes[1].stPneumaticAxisStatus.bError;
 
 //Assign LEDs to the end switches statuses
-bExtendedLight := GVL.astPneumaticAxes[x].stPneumaticAxisStatus.bExtended;
-bRetractedLight := GVL.astPneumaticAxes[x].stPneumaticAxisStatus.bRetracted;
+bExtendedLight := GVL.astPneumaticAxes[1].stPneumaticAxisStatus.bExtended;
+bRetractedLight := GVL.astPneumaticAxes[1].stPneumaticAxisStatus.bRetracted;
 
 //Checking the condition for the Moving LED
-bMovingLight := GVL.astPneumaticAxes[x].stPneumaticAxisStatus.bRetracting OR gvl.astPneumaticAxes[x].stPneumaticAxisStatus.bExtending;
+bMovingLight := GVL.astPneumaticAxes[1].stPneumaticAxisStatus.bRetracting OR gvl.astPneumaticAxes[1].stPneumaticAxisStatus.bExtending;
 *)
 ]]></ST>
     </Implementation>
diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU
index e183ea3..ab6434b 100644
--- a/solution/tc_project_app/POUs/MAIN.TcPOU
+++ b/solution/tc_project_app/POUs/MAIN.TcPOU
@@ -135,6 +135,7 @@ Safety_Shutter();
 //Application program calls
 Cabinet_Monitoring();
 Pneumatic_Box();
+//Shutter_Operator_Panel();
 //Application_Template();
 ]]></ST>
       </Implementation>
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index 00d39ce..6581927 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -43,7 +43,7 @@
     <Compile Include="POUs\Application_Specific\Applications\Pneumatic_Box.TcPOU">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="POUs\Application_Specific\Applications\Shutter_Operator_panel_Template.TcPOU">
+    <Compile Include="POUs\Application_Specific\Applications\Shutter_Operator_Panel.TcPOU">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="POUs\Application_Specific\Axes\Axis_Template.TcPOU">