diff -P -u -x '*~' -x '\.*' -r SF35-cupcake-non-heated/alterations/end.gcode SF35-cupcake-ABP/alterations/end.gcode
--- SF35-cupcake-non-heated/alterations/end.gcode	2011-02-04 16:01:34.000000000 +0100
+++ SF35-cupcake-ABP/alterations/end.gcode	2011-02-04 15:59:47.000000000 +0100
@@ -1,15 +1,31 @@
 (**** Beginning of end.gcode ****)
-(**** begin cool for safety ****)
-M104 S0 T0 (set extruder temperature)
-M109 S0 T0 (set heated-build-platform temperature)
-(**** end cool for safety ****)
+(*** begin settings ****)
+M109 S95 T0 (set heated-build-platform temperature)
+(**** end settings ****)
+(**** begin move to cooling position ****)
+G1 X0 Y54 F3300.0 (move to cooling position)
+(**** end move to cooling position ****)
 (**** begin filament reversal ****)
 M102 (Extruder on, reverse)
 G04 P2000 (Wait t/1000 seconds)
 M103 (Extruder off)
 (**** end filament reversal ****)
-(**** begin move to cooling position ****)
-G91
-G1 Z10
-(**** end move to cooling position ****)
+M18 (Turn off steppers)
+(**** begin eject ****)
+M6 T0 (wait for toolhead parts (nozzle, HBP, etc) to reach temperature)
+M106 (conveyor on)
+G04 P9000 (wait t/1000 seconds)
+M107 (conveyor off)
+(**** end eject ****)
+(**** begin cool for safety ****)
+M104 S0 T0 (set extruder temperature)
+M109 S0 T0 (set heated-build-platform temperature)
+(**** end cool for safety ****)
+(**** start wipe ****)
+G1 X-54 Y-15.5 Z6.0 F2500.0
+G1 X-54 Y15.5 Z6.0 F2500.0
+(**** end wipe ****)
+G1 X0 Y0 F3300.0 (move nozzle to center)
+G1 X0 Y0 Z0 F3300.0 (move nozzle to origin)
 (**** end of end.gcode ****)
+
diff -P -u -x '*~' -x '\.*' -r SF35-cupcake-non-heated/alterations/start.gcode SF35-cupcake-ABP/alterations/start.gcode
--- SF35-cupcake-non-heated/alterations/start.gcode	2011-02-04 15:55:38.000000000 +0100
+++ SF35-cupcake-ABP/alterations/start.gcode	2011-02-04 15:55:38.000000000 +0100
@@ -12,15 +12,11 @@
 G92 X0 Y0 Z0 (set origin to current position)
 (**** end homing ****)
 (**** begin pre-wipe commands ****)
-G0 Z15 (Move up for test extrusion)
+G1 X-54 Y-30 Z6 F3300.0 (move to waiting position)
 M108 S255 (Extruder speed = max)
 M6 T0 (Wait for tool to heat up)
 M101 (Extruder on, forward)
 G04 P5000 (Wait 5 seconds)
 M103 (Extruder off)
 (**** end pre-wipe commands ****)
-(**** begin manual wipe ****)
-M01 (The heater is warming up and will do a test extrusion.  Click yes after you have cleared the nozzle of the extrusion.)
-(**** end manual wipe ****)
-G0 Z0(Go back to zero.)
 (**** end of start.gcode ****)
diff -P -u -x '*~' -x '\.*' -r SF35-cupcake-non-heated/profiles/extrusion/ABS/wipe.csv SF35-cupcake-ABP/profiles/extrusion/ABS/wipe.csv
--- SF35-cupcake-non-heated/profiles/extrusion/ABS/wipe.csv	2011-02-04 15:55:38.000000000 +0100
+++ SF35-cupcake-ABP/profiles/extrusion/ABS/wipe.csv	2011-02-04 15:55:38.000000000 +0100
@@ -3,13 +3,13 @@
 WindowPosition	700+0
 Open File for Wipe	
 Activate Wipe	True
-Location Arrival X (mm):	52.0
-Location Arrival Y (mm):	-57.0
-Location Arrival Z (mm):	10.0
-Location Departure X (mm):	52.0
-Location Departure Y (mm):	-30.0
-Location Departure Z (mm):	10.0
-Location Wipe X (mm):	52.0
-Location Wipe Y (mm):	-55.0
-Location Wipe Z (mm):	10.0
+Location Arrival X (mm):	-54.0
+Location Arrival Y (mm):	-30.0
+Location Arrival Z (mm):	6.0
+Location Departure X (mm):	-54.0
+Location Departure Y (mm):	4.0
+Location Departure Z (mm):	6.0
+Location Wipe X (mm):	-54.0
+Location Wipe Y (mm):	0.0
+Location Wipe Z (mm):	6.0
 Wipe Period (layers):	99999999
