diff --git a/macros.d/macros.cfg b/macros.d/macros.cfg
index ad00236..16b94f4 100644
--- a/macros.d/macros.cfg
+++ b/macros.d/macros.cfg
@@ -84,14 +84,32 @@ gcode:
 
 [gcode_macro GOTO_CENTER]
 gcode:
+    ##### Get Boundaries #####
+    {% set max_x = printer.toolhead.axis_maximum.x|float %}
+    {% set max_y = printer.toolhead.axis_maximum.y|float %}
+    {% set max_z = printer.toolhead.axis_maximum.z|float %}
+    {% set mid_x = max_x / 2 %}
+    {% set mid_y = max_y / 2 %}
+
     LIFT_Z
     G90
-    G0 X175 Y175 F6000
+    G0 X{mid_x} Y{mid_y} F6000
 
 [gcode_macro LIFT_Z]
 gcode:
+    ##### Get Boundaries #####
+    {% set max_z = printer.toolhead.axis_maximum.z|float %}
+    {% set act_z = printer.toolhead.position.z|float %}
+
+    ##### Calculate save move #####
+    {% if act_z < (max_z - 2.0) %}
+      {% set z_safe = 2.0 %}
+    {% else %}
+      {% set z_safe = max_z - act_z %}
+    {% endif %}
+
     G91
-    G0 Z15 F2000
+    G0 Z{z_safe} F2000
     G90
 
 [gcode_macro SAVE_AT_END]
@@ -119,6 +137,8 @@ gcode:
 [gcode_macro TUNE_HOTBED]
 gcode:
     M117 Hotbed PID Cal
+    GOTO_CENTER
+    G0 Z5 F6000
     PID_CALIBRATE HEATER=heater_bed TARGET=100
     M117 Restarting...
     SAVE_AT_END