diff --git a/solution/tc_project_app/LineIDs.dbg b/solution/tc_project_app/LineIDs.dbg
index d28bd26..70f5aaa 100644
Binary files a/solution/tc_project_app/LineIDs.dbg and b/solution/tc_project_app/LineIDs.dbg differ
diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU
index 4093482..7bb4bab 100644
--- a/solution/tc_project_app/POUs/MAIN.TcPOU
+++ b/solution/tc_project_app/POUs/MAIN.TcPOU
@@ -34,25 +34,21 @@ AXES();]]></ST>
     <Folder Name="POSITION_RECOVERY" Id="{3561f6ef-e145-4ed3-9839-f17334bd2d97}" />
     <Action Name="AXES" Id="{7eb32732-9b53-4934-8cd9-20ba971dd8ff}">
       <Implementation>
-        <ST><![CDATA[
-
-//First cycle, assign FB_axis to interface array
+        <ST><![CDATA[//First cycle, assign FB_axis to interface array
 IF _TaskInfo[fbGetCurTaskIndex.index].FirstCycle THEN
     FOR GVL.iAxis := 1 TO GVL_APP.nAXIS_NUM DO
         afbAxes[GVL.iAxis].stAxis REF= astAxes[GVL.iAxis];
-        //aIAxes[GVL.iAxis] := afbAxes[GVL.iAxis];
+        aIAxes[GVL.iAxis] := afbAxes[GVL.iAxis];
     END_FOR
     //Custom axis types defined and linked to aiAxes here
-	  //fbCustomAxis extends FB_axis
+	  //FB_CustomAxis extends FB_axis
 		//fbCustomAxis.stAxis REF= astAxes[x];
+        //aIAxes[x] := fbCustomAxis;
 END_IF
 
 //Execute FB_Axis logic
 FOR GVL.iAxis := 1 TO GVL_APP.nAXIS_NUM DO
-	afbAxes[GVL.iAxis].Run();
-    //aIAxes[GVL.iAxis].Run();
-  //Run the Run() of the custom axis
-	//fbCustomAxis.Run();
+	aIAxes[GVL.iAxis].Run();
 END_FOR
 
 //Execute Pneumatic Axis logic
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index e2becdb..1f21fee 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit e2becdb1a3fbbfde36738eabdf3dcb44937adc71
+Subproject commit 1f21feeafd2b9a75694e1bf0430e098ba8588f3d