diff --git a/AgentBin/simulator/CMS_DEMO.xml b/AgentBin/simulator/CMS_DEMO.xml
index e76199e..9319780 100644
--- a/AgentBin/simulator/CMS_DEMO.xml
+++ b/AgentBin/simulator/CMS_DEMO.xml
@@ -10,11 +10,7 @@
         <DataItem category="SAMPLE" id="ACC_TIME" type="ACCUMULATED_TIME"/>
         <DataItem category="SAMPLE" id="CLOCK" type="CLOCK_TIME"/>
         <DataItem category="SAMPLE" id="POWER" type="WATTAGE"/>
-        <DataItem category="EVENT" id="CurrProg" type="PROGRAM"/>
-        <DataItem category="EVENT" id="CurrProg_RowNum" type="LINE"/>
         <DataItem category="EVENT" id="OperatorId" type="MESSAGE"/>
-        <DataItem category="EVENT" id="RUN_MODE" type="CONTROLLER_MODE"/>
-        <DataItem category="EVENT" id="EXECUTION" type="EXECUTION"/>
         <DataItem category="EVENT" id="Cod_M" type="MESSAGE"/>
         <DataItem category="EVENT" id="Cod_S" type="MESSAGE"/>
         <DataItem category="EVENT" id="Cod_T" type="MESSAGE"/>
@@ -164,8 +160,7 @@
                 <DataItem category="SAMPLE" id="cl3" name="Cload" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>-->
               </DataItems>
             </Rotary>
-            
-            <Linear id="z1" name="Z">
+            <!--<Linear id="z1" name="Z">
               <DataItems>
                 <DataItem category="SAMPLE" id="z2" name="Zact" nativeUnits="MILLIMETER" subType="ACTUAL" type="POSITION" units="MILLIMETER"/>
                 <DataItem category="SAMPLE" id="z3" name="Zcom" nativeUnits="MILLIMETER" subType="COMMANDED" type="POSITION" units="MILLIMETER"/>
@@ -173,7 +168,7 @@
                 <DataItem category="CONDITION" id="Zloadc" type="LOAD"/>
                 <DataItem category="CONDITION" id="Zsystem" type="SYSTEM"/>
               </DataItems>
-            </Linear>
+            </Linear>-->
           </Components>
         </Axes>
         <Controller id="cn1" name="controller">
@@ -185,21 +180,30 @@
             <DataItem category="CONDITION" id="system" type="SYSTEM"/>
           </DataItems>
           <Components>
-            <Path id="pth" name="path">
+            <Path id="Path_01" name="Path 01">
               <DataItems>
+                <DataItem category="EVENT" id="RUN_MODE" type="CONTROLLER_MODE"/>
+                <DataItem category="EVENT" id="CurrProg" type="PROGRAM"/>
+                <DataItem category="EVENT" id="CurrProg_RowNum" type="LINE"/>
+                <DataItem category="EVENT" id="EXECUTION" type="EXECUTION"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActX" nativeUnits="MILLIMETER" subType="ACTUAL" type="PATH_POSITION" units="MILLIMETER" name="Posizione X"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActY" nativeUnits="MILLIMETER" subType="ACTUAL" type="PATH_POSITION" units="MILLIMETER" name="Posizione Y"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActZ" nativeUnits="MILLIMETER" subType="ACTUAL" type="PATH_POSITION" units="MILLIMETER" name="Posizione Z"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActI" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE" name="Angolo I"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActJ" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE" name="Angolo J"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActK" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE" name="Angolo K"/>
+                <DataItem category="SAMPLE" id="Path_01_FeedRate" nativeUnits="MILLIMETER/SECOND" type="PATH_FEEDRATE" units="MILLIMETER/SECOND" subType="ACTUAL" name="Path FEED"/>
+                <DataItem category="SAMPLE" id="Path_01_FeedOverr" nativeUnits="PERCENT" type="PATH_FEEDRATE" units="PERCENT" subType="OVERRIDE" name="Path FEED Override"/>
+                <DataItem category="SAMPLE" id="Path_01_SpeedOverr" nativeUnits="PERCENT" type="PATH_FEEDRATE" units="PERCENT" subType="OVERRIDE" name="Path SPEED Override"/>
+                
+                
+                
+                
+                
                 <DataItem category="EVENT" id="cn2" name="block" type="BLOCK"/>
-                <DataItem category="EVENT" id="cn3" name="mode" type="CONTROLLER_MODE"/>
-                <DataItem category="EVENT" id="cn4" name="line" type="LINE"/>
-                <DataItem category="EVENT" id="cn5" name="program" type="PROGRAM"/>
-                <DataItem category="EVENT" id="cn6" name="execution" type="EXECUTION"/>
+>
                 <DataItem category="EVENT" id="cnt1" name="tool_id" type="TOOL_ID"/>
-                <DataItem category="SAMPLE" id="Ppos" nativeUnits="MILLIMETER_3D" subType="ACTUAL" type="PATH_POSITION" units="MILLIMETER_3D"/>
-                <DataItem category="SAMPLE" id="Frt" nativeUnits="MILLIMETER/SECOND" type="PATH_FEEDRATE" units="MILLIMETER/SECOND">
-                  <Source>path_feedrate</Source>
-                </DataItem>
-                <DataItem category="SAMPLE" id="Fovr" nativeUnits="PERCENT" type="PATH_FEEDRATE" units="PERCENT">
-                  <Source>feed_ovr</Source>
-                </DataItem>
+                
               </DataItems>
             </Path>
           </Components>
diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo
index 1293cea..2966b7a 100644
Binary files a/MTC_Sim/.vs/MTC_Sim/v14/.suo and b/MTC_Sim/.vs/MTC_Sim/v14/.suo differ