diff --git a/Haas_Lathes_BIDC/Bechtel ST-20Y.cps b/Haas_Lathes_BIDC/Bechtel ST-20Y.cps
index 351da16..342db24 100644
--- a/Haas_Lathes_BIDC/Bechtel ST-20Y.cps	
+++ b/Haas_Lathes_BIDC/Bechtel ST-20Y.cps	
@@ -356,7 +356,7 @@ properties = {
     description: "Tool loading and probing. By turning this off, you accept responsibility for any resulting crashes.",
     group: 99,
     type: "boolean",
-    value: true,
+    value: false,
     scope: "post"
   },
   loadToolsAtStart: {
@@ -364,7 +364,7 @@ properties = {
     description: "Tool loading only. By turning this off, you accept responsibility for any resulting crashes.",
     group: 99,
     type: "boolean",
-    value: true,
+    value: false,
     scope: "post"
   }
 };
@@ -1418,25 +1418,25 @@ function onOpen() {
     writeln("");
   }
 
-  if (getProperty("loadToolsAtStart") || getProperty("measureToolsAtStart")) {
-    writeln("");
-    // will1742 | Gavin Williams | 8/10/21
-    // Auto probe tools
-    var tools = getToolTable();
-    if (tools.getNumberOfTools() > 0) {
-      for (var i = 0; i < tools.getNumberOfTools(); ++i) {
-        var tool = tools.getTool(i);
-        var compensationOffset = tool.isTurningTool() ? tool.compensationOffset : tool.lengthOffset;
-        var toolPosition = toolFormat.format(tool.number * 100 + compensationOffset % 100);
-        var writeLoad = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock;
-        writeLoad("T" + toolFormat.format((tool.number - 3) >= 1 ? tool.number - 3 : tool.number + 9), mFormat.format(6));
-        writeLoad(mFormat.format(0));
-        writeComment("LOAD T" + tool.number + ": " + tool.description);
-        writeToolMeasureBlockBIDC(tool);
-      }
+
+  writeln("");
+  // will1742 | Gavin Williams | 8/10/21
+  // Auto probe tools
+  var tools = getToolTable();
+  if (tools.getNumberOfTools() > 0) {
+    for (var i = 0; i < tools.getNumberOfTools(); ++i) {
+      var tool = tools.getTool(i);
+      var compensationOffset = tool.isTurningTool() ? tool.compensationOffset : tool.lengthOffset;
+      var toolPosition = toolFormat.format(tool.number * 100 + compensationOffset % 100);
+      var writeLoad = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock;
+      writeLoad("T" + toolFormat.format((tool.number - 3) >= 1 ? tool.number - 3 : tool.number + 9), mFormat.format(6));
+      writeLoad(mFormat.format(0));
+      writeComment("LOAD T" + tool.number + ": " + tool.description);
+      writeToolMeasureBlockBIDC(tool);
     }
   }
 
+
   if (false) {
     // check for duplicate tool number
     for (var i = 0; i < getNumberOfSections(); ++i) {