diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg
index 7356d51..6872a33 100644
--- a/cfgs/misc-macros.cfg
+++ b/cfgs/misc-macros.cfg
@@ -1,7 +1,7 @@
 [force_move]
 enable_force_move: True
 
-# NOTE If you're using a Raspberry Pi, you can uncomment the next to lines, optionally.
+# NOTE If you're using a Raspberry Pi, you can uncomment the next 2 lines, optionally.
 # [temperature_sensor raspberry_pi]
 # sensor_type: temperature_host
 
@@ -124,24 +124,28 @@ gcode:
     
     #   Set safe speeds
     {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %}
-    {% set maxVelocityAdjusted =  (0.90 * maxVelocity * 60)|int  %}
+    {% set maxVelocityAdjusted =  (0.90 * maxVelocity * 60)|int %}
+    {% set bedtempAlmost =  (bedtemp - 2)|int %}
+    {% set hotendtempStepOne = 150|int %}
+    {% set hotendtempStepTwo = 170|int %}
 
+    BED_MESH_PROFILE LOAD=default                                                ; NOTE if not using a mesh, comment out this line
     ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1
 
     G90
-    M140 S{bedtemp}                                                              ; set & don't wait for bed temp
-    M104 S150                                                                    ; set & don't wait for hotend temp
+    M140 S{bedtempAlmost}                                                        ; set & don't wait for bed temp
+    M104 S{hotendtempStepOne}                                                    ; set & don't wait for hotend temp
     G28 X Y
 
+    M190 S{bedtempAlmost}                                                        ; set & wait for bed temp
+    M104 S{hotendtempStepTwo}                                                    ; set & don't wait for hotend temp
     M190 S{bedtemp}                                                              ; set & wait for bed temp
-    M104 S{hotendtemp}                                                           ; set & don't wait for hotend temp
     G28 Z                                                                        ; final z homing
 
-    G1 X0 Y0 F{maxVelocityAdjusted}
     M109 S{hotendtemp}                                                           ; set & wait for hotend temp
+    G1 X0 Y0 F{maxVelocityAdjusted}
 
-    BED_MESH_PROFILE LOAD=default
-    G1 Z20 F3000                   ; move nozzle away from bed
+    G1 Z20 F3000                                                                 ; move nozzle away from bed
 
 [gcode_macro PRINT_END]
 gcode: