diff --git a/src/com/t_oster/liblasercut/drivers/Marlin.java b/src/com/t_oster/liblasercut/drivers/Marlin.java
index 4cad848d0b09da7802ddeb6b72426fa4013e4fe7..d00a7907ea26d7509eda7ddd737b7bde9306883a 100644
--- a/src/com/t_oster/liblasercut/drivers/Marlin.java
+++ b/src/com/t_oster/liblasercut/drivers/Marlin.java
@@ -38,8 +38,8 @@ public class Marlin extends GenericGcodeDriver {
     setWaitForOKafterEachLine(true);
     setBaudRate(115200);
     setLineend("CRLF");
-    setInitDelay(10);
-    setPreJobGcode(getPreJobGcode()+",G28 XY,M3");
+    setInitDelay(0);
+    setPreJobGcode(getPreJobGcode()+",G28 XY,M5");
     setPostJobGcode(getPostJobGcode()+",G0 X0Y0,M5");
     
     //Marlin has no way to upload over the network so remove the upload url text