diff --git a/src/main/java/baritone/bot/Settings.java b/src/main/java/baritone/bot/Settings.java
index ecc7f7c2..13da50bb 100644
--- a/src/main/java/baritone/bot/Settings.java
+++ b/src/main/java/baritone/bot/Settings.java
@@ -129,6 +129,11 @@ public class Settings {
      */
     public Setting<Integer> maxFallHeight = new Setting<>(3);
 
+    /**
+     * If a movement takes this many ticks more than its initial cost estimate, cancel it
+     */
+    public Setting<Integer> movementTimeoutTicks = new Setting<>(100);
+
     /**
      * Pathing can never take longer than this
      */
diff --git a/src/main/java/baritone/bot/pathing/path/PathExecutor.java b/src/main/java/baritone/bot/pathing/path/PathExecutor.java
index ae14d3d8..430606de 100644
--- a/src/main/java/baritone/bot/pathing/path/PathExecutor.java
+++ b/src/main/java/baritone/bot/pathing/path/PathExecutor.java
@@ -85,7 +85,7 @@ public class PathExecutor implements Helper {
             return true;
         }
         if (!whereShouldIBe.equals(whereAmI)) {
-            System.out.println("Should be at " + whereShouldIBe + " actually am at " + whereAmI);
+            //System.out.println("Should be at " + whereShouldIBe + " actually am at " + whereAmI);
             if (!Blocks.AIR.equals(BlockStateInterface.getBlock(whereAmI.down()))) {//do not skip if standing on air, because our position isn't stable to skip
                 for (int i = 0; i < pathPosition - 2 && i < path.length(); i++) {//this happens for example when you lag out and get teleported back a couple blocks
                     if (whereAmI.equals(path.positions().get(i))) {
@@ -100,6 +100,7 @@ public class PathExecutor implements Helper {
                         if (i - pathPosition > 2) {
                             displayChatMessageRaw("Skipping forward " + (i - pathPosition) + " steps, to " + i);
                         }
+                        System.out.println("Double skip sundae");
                         pathPosition = i - 1;
                         Baritone.INSTANCE.getInputOverrideHandler().clearAllKeys();
                         return false;
@@ -224,12 +225,12 @@ public class PathExecutor implements Helper {
             return true;
         } else {
             ticksOnCurrent++;
-            if (ticksOnCurrent > currentMovementInitialCostEstimate + 100) {
+            if (ticksOnCurrent > currentMovementInitialCostEstimate + Baritone.settings().movementTimeoutTicks.get()) {
                 // only fail if the total time has exceeded the initial estimate
                 // as you break the blocks required, the remaining cost goes down, to the point where
-                // ticksOnCurrent is greater than recalculateCost + 1000
+                // ticksOnCurrent is greater than recalculateCost + 100
                 // this is why we cache cost at the beginning, and don't recalculate for this comparison every tick
-                displayChatMessageRaw("This movement has taken too long (" + ticksOnCurrent + " ticks, expected " + movement.getCost(null) + "). Cancelling.");
+                displayChatMessageRaw("This movement has taken too long (" + ticksOnCurrent + " ticks, expected " + currentMovementInitialCostEstimate + "). Cancelling.");
                 movement.cancel();
                 Baritone.INSTANCE.getInputOverrideHandler().clearAllKeys();
                 pathPosition = path.length() + 3;