diff --git a/CMS_CORE_Library/DataStructures.cs b/CMS_CORE_Library/DataStructures.cs
index d15a344..630f7fa 100644
--- a/CMS_CORE_Library/DataStructures.cs
+++ b/CMS_CORE_Library/DataStructures.cs
@@ -307,6 +307,7 @@ namespace CMS_CORE_Library
         {
             public bool LoadNextProgram;
             public QUEUE_STATUS Status;
+            public bool StartStopQueueEnabled;
         }
 
         public enum QUEUE_STATUS
diff --git a/CMS_CORE_Library/Demo/Nc_Demo.cs b/CMS_CORE_Library/Demo/Nc_Demo.cs
index 4c71c58..b822acc 100644
--- a/CMS_CORE_Library/Demo/Nc_Demo.cs
+++ b/CMS_CORE_Library/Demo/Nc_Demo.cs
@@ -1804,23 +1804,30 @@ namespace CMS_CORE.Demo
             if (cmsError.IsError())
                 return cmsError;
 
-            // Read tool manager status
+            // Read next cmd
             byte next = 0;
             cmsError = MEM_RWByte(R, 0, QUEUE_NEXT.MemType, QUEUE_NEXT.Address, 0, ref next);
             if (cmsError.IsError())
                 return cmsError;
 
+            // Read start & stop
+            byte startStopActive = 0;
+            cmsError = MEM_RWByte(R, 0, QUEUE_NEXT.MemType, QUEUE_NEXT.Address, 0, ref startStopActive);
+            if (cmsError.IsError())
+                return cmsError;
+
             status = new QueueStatusModel()
             {
                 LoadNextProgram = next == 1,
-                Status = (QUEUE_STATUS)readStatus
+                Status = (QUEUE_STATUS)readStatus,
+                StartStopQueueEnabled = startStopActive == 1
             };
-            
-            if(next == 1)
+
+            if (next == 1)
             {
                 // Read tool manager status
-                next = 0;
-                cmsError = MEM_RWByte(W, 0, QUEUE_NEXT.MemType, QUEUE_NEXT.Address, 0, ref next);
+                byte val = 0;
+                cmsError = MEM_RWByte(W, 0, QUEUE_NEXT.MemType, QUEUE_NEXT.Address, 0, ref val);
                 if (cmsError.IsError())
                     return cmsError;
             }
@@ -1852,6 +1859,16 @@ namespace CMS_CORE.Demo
             return MEM_RWByte(W, 0, QUEUE_CMD.MemType, QUEUE_CMD.Address, 0, ref startValue);
         }
 
+        public override CmsError FILES_WLoadNextPartProgram(string localPath, string ncFileName)
+        {
+            // Check if the NC Demo is Connected
+            CmsError cmsError = CheckConnection();
+            if (cmsError.IsError())
+                return cmsError;
+            
+            return NO_ERROR;
+        }
+
         #endregion File Management
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs
index 23b8f2d..6725f59 100644
--- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs
+++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs
@@ -1720,11 +1720,16 @@ namespace CMS_CORE.Fanuc
             return NO_ERROR;
         }
 
+        public override CmsError FILES_WLoadNextPartProgram(string localPath, string ncFileName)
+        {
+            return NO_ERROR;
+        }
+
         #endregion File Management
 
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+            ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-        #region Tools Management
+            #region Tools Management
 
         public override CmsError TOOLS_RConfiguration(ref ToolTableConfiguration config)
         {
diff --git a/CMS_CORE_Library/Nc.cs b/CMS_CORE_Library/Nc.cs
index d568313..4b02f11 100644
--- a/CMS_CORE_Library/Nc.cs
+++ b/CMS_CORE_Library/Nc.cs
@@ -1355,6 +1355,9 @@ namespace CMS_CORE
         public abstract CmsError FILES_WStartQueue();
 
         public abstract CmsError FILES_WStopQueue();
+        
+        public abstract CmsError FILES_WLoadNextPartProgram(string localPath, string ncFileName);
+
 
         #endregion File Management (To override)
 
diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs
index 9ad9b9b..fa34f6d 100644
--- a/CMS_CORE_Library/Osai/Nc_Osai.cs
+++ b/CMS_CORE_Library/Osai/Nc_Osai.cs
@@ -2321,6 +2321,11 @@ namespace CMS_CORE.Osai
             return NO_ERROR;
         }
 
+        public override CmsError FILES_WLoadNextPartProgram(string localPath, string ncFileName)
+        {
+            return NO_ERROR;
+        }
+
         #endregion File Management
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs
index 0d868e6..8f80159 100644
--- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs
+++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs
@@ -2141,6 +2141,12 @@ namespace CMS_CORE.Siemens
             return NO_ERROR;
         }
 
+        public override CmsError FILES_WLoadNextPartProgram(string localPath, string ncFileName)
+        {
+            return NO_ERROR;
+        }
+
+
         private IEnumerable<string> GetLinesFromString(string text)
         {
             string line;