diff --git a/ercf/software.cfg b/ercf/software.cfg
index b622561..5ddf8c2 100644
--- a/ercf/software.cfg
+++ b/ercf/software.cfg
@@ -29,7 +29,7 @@ description: Empty macro to store ERCF variables
 # Galileo Clockwork with ERCF V1.1 sensor (hall effect) : 27.0
 # LGX on AfterBurner with ERCF V1.1 sensor (hall effect) : 44.0
 # AfterBurner Clockwork with ERCF V1.1 sensor (hall effect) : 36.0
-variable_end_of_bowden_to_sensor: 40 # xk
+variable_end_of_bowden_to_sensor: 44 # xk
 # Length from the sensor to the nozzle melt pool.
 # Reduce this value if there are blobs of filament on each load, before the purge on the tower.
 # Increase this value if there are big gaps on the purge tower (i.e. if it takes time for the filament to get pushed out after a swap)
@@ -37,7 +37,7 @@ variable_end_of_bowden_to_sensor: 40 # xk
 # Galileo Clockwork with ERCF 1.1 sensor (hall effect) & Dragon Normal Flow : 60.5
 # LGX on AfterBurner with ERCF 1.1 sensor (hall effect) & Dragon Normal Flow : 55.6
 # AfterBurner Clockwork with ERCF 1.1 sensor (hall effect) & Dragon Normal Flow : 54.0
-variable_sensor_to_nozzle: 60 # xk
+variable_sensor_to_nozzle: 65 # xk
 #
 # ==== Values to tune ====
 #
diff --git a/macros/print.cfg b/macros/print.cfg
index dbbc51c..372b364 100644
--- a/macros/print.cfg
+++ b/macros/print.cfg
@@ -155,7 +155,6 @@ gcode:
   M118 HOME
   G28
   BRUSHIE
-  G28 Z
   # QGL
   {% if QGL %}
     M117 QGL
@@ -181,7 +180,11 @@ gcode:
   G90                     # use absolute coordinates
   NOTIFY_BED BED={BED}
   M190 S{BED}             # set and wait for actual bed temperature
-  NOTIFY_EXTRUDER EXTRUDER={BED}
+  # final home z
+  G28 Z
+  PARK Z=10
+  # heat extruder
+  NOTIFY_EXTRUDER EXTRUDER={EXTRUDER}
   M109 S{EXTRUDER}        # set and wait for extruder temperature
 
   SET_GCODE_OFFSET Z_ADJUST={params.Z_ADJUST|default(0.0)|float} MOVE=1