diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg
index e0a245f..e84062b 100644
--- a/cfgs/misc-macros.cfg
+++ b/cfgs/misc-macros.cfg
@@ -52,41 +52,55 @@ gcode:
         SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE={NEWSTATUS}
     {% endif %}
 
-# [gcode_macro M109]
-# rename_existing: M99109
-# gcode:
-#     #Parameters
-#     {% set s = params.S|float %}
+[gcode_macro M109]
+rename_existing: M99109
+gcode:
+    #Parameters
+    {% set s = params.S|float %}
     
-#     M104 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %}  ; Set hotend temp
-#     {% if s != 0 %}
-#         TEMPERATURE_WAIT SENSOR=extruder MINIMUM={s} MAXIMUM={s+1}   ; Wait for hotend temp (within 1 degree)
-#     {% endif %}
+    M104 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %}  ; Set hotend temp
+    {% if s != 0 %}
+        TEMPERATURE_WAIT SENSOR=extruder MINIMUM={s} MAXIMUM={s+1}   ; Wait for hotend temp (within 1 degree)
+    {% endif %}
 
-# [gcode_macro M190]
-# rename_existing: M99190
-# gcode:
-#     #Parameters
-#     {% set s = params.S|float %}
+[gcode_macro M190]
+rename_existing: M99190
+gcode:
+    #Parameters
+    {% set s = params.S|float %}
 
-#     M140 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %}   ; Set bed temp
-#     {% if s != 0 %}
-#         TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s} MAXIMUM={s+1}  ; Wait for bed temp (within 1 degree)
-#     {% endif %}
+    M140 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %}   ; Set bed temp
+    {% if s != 0 %}
+        TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s} MAXIMUM={s+1}  ; Wait for bed temp (within 1 degree)
+    {% endif %}
 
 [gcode_macro PURGE_LINE]
-# https://github.com/JoeCat1207/V0.1-Purge-line-SuperSlicer/blob/main/Purgeline.txt
-# https://github.com/VoronDesign/Voron-Switchwire/blob/200cdae033c59ef81f67c4235469da7ca66d53a1/Firmware/skr_mini_e3_v2_config.cfg
 gcode:
     {% set PRE_PURGE_PRIME_LENGTH=printer["gcode_macro _globals"].pre_purge_prime_length|default(1.40)|float %}
     ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1
 
-    G0 Y0 X0 F4000                         ; go to tongue of print bed
-    G1 Z0.4 F500.0                          ; move bed to nozzle
+    #   Get Boundaries
+    {% set max_x = printer.configfile.config["stepper_x"]["position_max"]|float %}
+    {% set max_y = printer.configfile.config["stepper_y"]["position_max"]|float %}
+    {% set max_z = printer.configfile.config["stepper_z"]["position_max"]|float %}
+    {% set extrudeAmount = 26.6 %}
+    {% set movementLength = 100 %}
+    {% set movementSpeed = 15 * 60 %}
+
+    #   Set safe speeds
+    {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %}
+    {% set maxVelocityAdjusted =  (0.9 * maxVelocity * 60)|int  %}
+
     G92 E0.0                                ; reset extruder
+    G90                                     ; Absolute positioning
+    G0 X0 Y0 F{maxVelocityAdjusted}         ; move to purge position
+    G1 Z0.4 F500.0                          ; move to purge height
+    M83                                     ; Relative extrusion mode
     G1 E{PRE_PURGE_PRIME_LENGTH} F500       ; pre-purge prime LENGTH SHOULD MATCH YOUR PRINT_END RETRACT
-    G1 Y140 E35.0 F1200.0                   ; intro line 1
+    G1 X{movementLength} E{extrudeAmount} F{movementSpeed}       ; intro line 1
+    #G1 E-.5 F2100                                                                       # Retract
     G92 E0.0                                ; reset extruder
+    M82                                     ; Absolute extrusion mode
     G1 Z5.0                                 ; move nozzle to prevent scratch
 
 [gcode_macro CANCEL_PRINT]
@@ -135,8 +149,8 @@ gcode:
     #   Set safe speeds
     {% set zVelocity = printer.configfile.settings.printer.max_z_velocity|default(15)|int %}
     {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %}
-    {% set zVelocityAdjusted =  (0.85 * zVelocity * 60)|int  %}
-    {% set maxVelocityAdjusted =  (0.85 * maxVelocity * 60)|int  %}
+    {% set zVelocityAdjusted =  (0.95 * zVelocity * 60)|int  %}
+    {% set maxVelocityAdjusted =  (0.95 * maxVelocity * 60)|int  %}
 
     #   Get Boundaries
     {% set max_x = printer.configfile.config["stepper_x"]["position_max"]|float %}