diff --git a/printer.cfg b/printer.cfg
index ed8fc7e..1fc1ec1 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -1,3 +1,6 @@
+[include moonraker_obico_macros.cfg]
+#[include mmu/base/*.cfg]
+#[include mmu/optional/client_macros.cfg]
 [include mainsail.cfg]
 
 # host MCU service is preinstalled and ready to use with:
@@ -429,7 +432,6 @@ default_type: echo
 
 [gcode_macro G32]
 gcode:
-    BED_MESH_CLEAR
     G28
     QUAD_GANTRY_LEVEL
     G28
@@ -445,6 +447,7 @@ gcode:
 
 [gcode_macro PRINT_START]
 gcode:
+
     SET_LED LED="caselight" RED=0.898 GREEN=1 BLUE=0 SYNC=0 TRANSMIT=1
     M140 S{ params.BED | float }                                    ; set bed temperature
 
@@ -460,6 +463,14 @@ gcode:
     {% endif %}
                                                           ; get nozzle to probing temperture
     M190 S{ params.BED | float }                                    ; wait for bed to reach temperture
+    ; If QGL is NO, only do G28 (axis homing)
+    ; If QGL is YES or not defined, do G32 (axis homing + QGL)
+    ; First Check if QGL exists, then check if it is YES
+    {% if params.QGL is defined and params.QGL == "NO" %}
+        G28
+    {% else %}
+        G32
+    {% endif %}
     G32                                                             ; home all axes
     G1 Z20 F3000                                                    ; move nozzle away from bed
     M109 S{ params.EXTRUDER | float }                               ; wait for nozzle to reach temperture
@@ -495,9 +506,11 @@ gcode:
 [gcode_macro UNLOAD_FILAMENT]
 gcode:
     M83
-    G1 E-50 F3000
-    G1 E-50 F3000
-    G1 E-50 F3000
+    G1 E-35 F8000
+    G1 E26 F750
+    G4 P1000
+    G1 E-50 F8000
+    G1 E-50 F8000
 
 [gcode_macro M106]
 gcode: