diff --git a/Haas_Lathes_BIDC/Bechtel ST-20.cps b/Haas_Lathes_BIDC/Bechtel ST-20.cps
index d5048de..4340c4b 100644
--- a/Haas_Lathes_BIDC/Bechtel ST-20.cps	
+++ b/Haas_Lathes_BIDC/Bechtel ST-20.cps	
@@ -131,14 +131,13 @@ properties = {/*
     type: "boolean",
     value: false,
     scope: "post"
-  },
+  },*/
   maximumSpindleSpeed: {
     title: "Max spindle speed",
     description: "Defines the maximum spindle speed allowed on the main spindle.",
-    group: 4,
     type: "integer",
     range: [0, 999999999]
-  },
+  },/*
   subMaximumSpindleSpeed: {
     title: "Max spindle speed for subspindle",
     description: "Defines the maximum spindle speed allowed on the subspindle.",
@@ -860,7 +859,7 @@ function startSpindle(forceRPMMode, initialPosition, rpm) {
   }
 
   var useConstantSurfaceSpeed = currentSection.getTool().getSpindleMode() == SPINDLE_CONSTANT_SURFACE_SPEED;
-  var maxSpeed = (currentSection.spindle == SPINDLE_SECONDARY) ? staticProperties.subMaximumSpindleSpeed : staticProperties.maximumSpindleSpeed;
+  var maxSpeed = (currentSection.spindle == SPINDLE_SECONDARY) ? staticProperties.subMaximumSpindleSpeed : getProperty("maximumSpindleSpeed");
   var maximumSpindleSpeed = (tool.maximumSpindleSpeed > 0) ? Math.min(tool.maximumSpindleSpeed, maxSpeed) : maxSpeed;
   if (useConstantSurfaceSpeed && !forceRPMMode) {
     skipBlock = _skipBlock;
@@ -1574,7 +1573,7 @@ function onOpen() {
     }
   }
 
-  writeBlock(gFormat.format(50), sOutput.format(getSection(0).spindle == SPINDLE_PRIMARY ? staticProperties.maximumSpindleSpeed : staticProperties.subMaximumSpindleSpeed));
+  writeBlock(gFormat.format(50), sOutput.format(getSection(0).spindle == SPINDLE_PRIMARY ? getProperty("maximumSpindleSpeed") : staticProperties.subMaximumSpindleSpeed));
   sOutput.reset();
 
   if (staticProperties.gotChipConveyor) {
@@ -4613,5 +4612,5 @@ function setProperty(property, value) {
 }
 // <<<<< INCLUDED FROM ../common/haas lathe.cps
 
-// properties.maximumSpindleSpeed.value = 4000;
+properties.maximumSpindleSpeed.value = 4000;
 // properties.subMaximumSpindleSpeed.value = 4000;
diff --git a/Haas_Lathes_BIDC/Bechtel ST-20Y.cps b/Haas_Lathes_BIDC/Bechtel ST-20Y.cps
index a346884..740b163 100644
--- a/Haas_Lathes_BIDC/Bechtel ST-20Y.cps	
+++ b/Haas_Lathes_BIDC/Bechtel ST-20Y.cps	
@@ -131,14 +131,13 @@ properties = {/*
     type: "boolean",
     value: false,
     scope: "post"
-  },
+  },*/
   maximumSpindleSpeed: {
     title: "Max spindle speed",
     description: "Defines the maximum spindle speed allowed on the main spindle.",
-    group: 4,
     type: "integer",
     range: [0, 999999999]
-  },
+  },/*
   subMaximumSpindleSpeed: {
     title: "Max spindle speed for subspindle",
     description: "Defines the maximum spindle speed allowed on the subspindle.",
@@ -928,7 +927,7 @@ function startSpindle(forceRPMMode, initialPosition, rpm) {
   }
 
   var useConstantSurfaceSpeed = currentSection.getTool().getSpindleMode() == SPINDLE_CONSTANT_SURFACE_SPEED;
-  var maxSpeed = (currentSection.spindle == SPINDLE_SECONDARY) ? staticProperties.subMaximumSpindleSpeed : staticProperties.maximumSpindleSpeed;
+  var maxSpeed = (currentSection.spindle == SPINDLE_SECONDARY) ? staticProperties.subMaximumSpindleSpeed : getProperty("maximumSpindleSpeed");
   var maximumSpindleSpeed = (tool.maximumSpindleSpeed > 0) ? Math.min(tool.maximumSpindleSpeed, maxSpeed) : maxSpeed;
   if (useConstantSurfaceSpeed && !forceRPMMode) {
     skipBlock = _skipBlock;
@@ -1658,7 +1657,7 @@ function onOpen() {
     }
   }
 
-  writeBlock(gFormat.format(50), sOutput.format(getSection(0).spindle == SPINDLE_PRIMARY ? staticProperties.maximumSpindleSpeed : staticProperties.subMaximumSpindleSpeed));
+  writeBlock(gFormat.format(50), sOutput.format(getSection(0).spindle == SPINDLE_PRIMARY ? getProperty("maximumSpindleSpeed") : staticProperties.subMaximumSpindleSpeed));
   sOutput.reset();
 
   if (staticProperties.gotChipConveyor) {
@@ -4696,5 +4695,5 @@ function setProperty(property, value) {
 }
 // <<<<< INCLUDED FROM ../common/haas lathe.cps
 
-// properties.maximumSpindleSpeed.value = 4000;
+properties.maximumSpindleSpeed.value = 4000;
 // properties.subMaximumSpindleSpeed.value = 4000;