diff --git a/Haas_Lathes_BIDC/Bechtel ST-20.cps b/Haas_Lathes_BIDC/Bechtel ST-20.cps
index 811e20f..f0a2c39 100644
--- a/Haas_Lathes_BIDC/Bechtel ST-20.cps	
+++ b/Haas_Lathes_BIDC/Bechtel ST-20.cps	
@@ -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: false,
+    value: true,
     scope: "post"
   }
 };
@@ -1199,6 +1199,8 @@ function getHaasProbingTypeBIDC(tool, internal) {
 }
 
 function writeToolMeasureBlockBIDC(tool) {
+  var writeMeasure = getProperty("measureToolsAtStart") ? writeBlock : writeOptionalBlock;
+
   var holder = getToolHolderBIDCST20(tool.number);
 
   let measureTool = new getCompleteTool(holder, tool);
@@ -1209,27 +1211,27 @@ function writeToolMeasureBlockBIDC(tool) {
     return;
   }
 
-  writeBlock(gFormat.format(10), "L10 P" + tool.number, xOffset.format(measureTool.probeX()));
-  writeBlock(gFormat.format(10), "L10 P" + tool.number, zOffset.format(measureTool.probeZ()));
+  writeMeasure(gFormat.format(10), "L10 P" + tool.number, xOffset.format(measureTool.probeX()));
+  writeMeasure(gFormat.format(10), "L10 P" + tool.number, zOffset.format(measureTool.probeZ()));
   if(tool.noseRadius != 0 || tool.cornerRadius != 0) {
-    writeBlock(gFormat.format(10), "L10 P" + tool.number, rOffset.format(tool.cornerRadius != 0 ? tool.cornerRadius : tool.noseRadius));
+    writeMeasure(gFormat.format(10), "L10 P" + tool.number, rOffset.format(tool.cornerRadius != 0 ? tool.cornerRadius : tool.noseRadius));
   }
 
   // if (tool.type == TOOL_TURNING_THREADING) {
-  //   writeBlock(gFormat.format(10), "L10 P" + tool.number, rOffset.format(tool.threadPitch*2));
+  //   writeMeasure(gFormat.format(10), "L10 P" + tool.number, rOffset.format(tool.threadPitch*2));
   // }
 
-  writeBlock("T" + toolFormat.format(tool.number * 100 + compensationOffset % 100));
+  writeMeasure("T" + toolFormat.format(tool.number * 100 + compensationOffset % 100));
   writeComment("PROBE: " + measureTool.offsetType + ", " + probeType.name);
-  writeBlock(mFormat.format(104));
-  writeBlock(gFormat.format(212), "H" + probeType.num);
-  writeBlock(mFormat.format(105));
+  writeMeasure(mFormat.format(104));
+  writeMeasure(gFormat.format(212), "H" + probeType.num);
+  writeMeasure(mFormat.format(105));
 
   // if (tool.type == TOOL_TURNING_THREADING) {
-  //   writeBlock(gFormat.format(10), "L10 P" + tool.number, rOffset.format(0));
+  //   writeMeasure(gFormat.format(10), "L10 P" + tool.number, rOffset.format(0));
   // }
   if (measureTool.offsetType == "Indexible Drill") {
-    writeBlock(gFormat.format(10), "L10 P" + tool.number, xOffset.format(measureTool.machineX()));
+    writeMeasure(gFormat.format(10), "L10 P" + tool.number, xOffset.format(measureTool.machineX()));
   }
 
   writeln("");
@@ -1360,18 +1362,15 @@ function onOpen() {
     // will1742 | Gavin Williams | 8/10/21
     // Auto probe tools
     var tools = getToolTable();
-    if (tools.getNumberOfTools() > 0 && (getProperty("measureToolsAtStart") || getProperty("loadToolsAtStart"))) {
+    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);
-        writeBlock("T" + toolFormat.format((tool.number - 3) >= 1 ? tool.number - 3 : tool.number + 9), mFormat.format(6));
-        writeBlock(mFormat.format(0));
+        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);
-        if (!getProperty("measureToolsAtStart")) {
-          writeln("");
-          continue;
-        }
         writeToolMeasureBlockBIDC(tool);
       }
     }