diff --git a/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg b/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg
index 66ff0d6..950419e 100644
--- a/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg
+++ b/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg
@@ -48,7 +48,7 @@
 [gcode_macro MECHANICAL_GANTRY_CALIBRATION]
 gcode:
     ### SET THIS DEFAULT CARFULLY - start really low
-    {% set my_current = params.CURRENT|default(0.12)|float %} ; adjust crash current on the fly :D
+    {% set my_current = params.CURRENT|default(0.20)|float %} ; adjust crash current on the fly :D
     ###
     {% set oldcurrent = printer.configfile.settings["tmc2209 stepper_z"].run_current %} ; TODO: Find runtime current settings
     {% set oldhold = printer.configfile.settings["tmc2209 stepper_z"].hold_current %} 
@@ -64,7 +64,7 @@ gcode:
     G90 ; absolute
     G0 X{x_max / 2} Y{y_max / 2} F{fast_move * 30 } ;put toolhead in the center of the gantry
 
-    G0 Z{z_max -1} F{fast_move_z * 60 } ; go to the Z-max at speed max z speed
+    G0 Z{z_max -5} F{fast_move_z * 60 } ; go to the Z-max at speed max z speed ; CHANGED
     
     SET_TMC_CURRENT STEPPER=stepper_z CURRENT={my_current} ; drop current on Z stepper
     
@@ -72,13 +72,16 @@ gcode:
         SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT={my_current} ; drop current
     {% endif %}
 
+    BEEP I=1
     G4 P200 ; Probably not necessary, it is here just for sure
 
-    SET_KINEMATIC_POSITION Z={z_max - 12} ; Trick printer into beleiving the gantry is 12mm lower than it is
+    SET_KINEMATIC_POSITION Z={z_max - 17} ; Trick printer into beleiving the gantry is 17mm lower than it is ; CHANGED
 
-    G1 Z{z_max -2} F{6 * 60} ; try to move 10mm up
-    G4 P200 ; wait
+    G1 Z{z_max} F{6 * 60} ; try to move 17mm up ; CHANGED
+    BEEP I=2
+    G4 P10000 ; wait 10 seconds
     G1 Z{z_max -6} F{6 * 60} ; move 4mm down
+    BEEP I=3
     G4 P200 ; same as the first one
     
     SET_TMC_CURRENT STEPPER=stepper_z CURRENT={oldcurrent} HOLDCURRENT={oldhold}
diff --git a/printer.cfg b/printer.cfg
index 11d4697..2c0e6d5 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -84,7 +84,7 @@ microsteps: 32
 rotation_distance: 4
 endstop_pin: probe:z_virtual_endstop
 position_min: -3
-position_max: 257
+position_max: 258
 homing_speed: 5
 
 [tmc2209 stepper_z]