diff --git a/CAM/zoncoffee.GTP b/CAM/zoncoffee.GTP
--- a/CAM/zoncoffee.GTP
+++ b/CAM/zoncoffee.GTP
@@ -17,11 +17,12 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD17R,0.0217X0.0472*%
 %ADD18C,0.0118*%
 %ADD19R,0.0276X0.0197*%
-%ADD20R,0.0276X0.0354*%
-%ADD21R,0.0354X0.0276*%
-%ADD22R,0.0276X0.0177*%
-%ADD23R,0.0197X0.0571*%
-%ADD24R,0.0571X0.0197*%
+%ADD20R,0.0433X0.0394*%
+%ADD21R,0.0276X0.0354*%
+%ADD22R,0.0354X0.0276*%
+%ADD23R,0.0276X0.0177*%
+%ADD24R,0.0197X0.0571*%
+%ADD25R,0.0571X0.0197*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1476,14 +1477,17 @@ D19*
 X017718Y008643D03*
 X017207Y008643D03*
 D20*
-X015511Y007737D03*
+X013309Y007675D03*
+X012639Y007675D03*
+D21*
+X012043Y007706D03*
+X011531Y007706D03*
 X014999Y007737D03*
-X013136Y007768D03*
-X012624Y007768D03*
-X012230Y007768D03*
-X011718Y007768D03*
+X015511Y007737D03*
+X019687Y008018D03*
+X020199Y008018D03*
+X013199Y005393D03*
 X012687Y005393D03*
-X013199Y005393D03*
 X006949Y008237D03*
 X006437Y008237D03*
 X005324Y008268D03*
@@ -1494,52 +1498,50 @@ X005324Y005643D03*
 X004812Y005643D03*
 X005999Y004893D03*
 X006511Y004893D03*
-X019687Y008018D03*
-X020199Y008018D03*
-D21*
-X013880Y006868D03*
+D22*
 X013880Y006356D03*
-D22*
-X005373Y006486D03*
+X013880Y006868D03*
+D23*
 X005373Y006801D03*
-X005373Y007116D03*
-X004763Y007116D03*
-X004763Y006801D03*
+X005373Y006486D03*
+X005373Y006171D03*
+X004763Y006171D03*
 X004763Y006486D03*
-X004763Y006171D03*
-X005373Y006171D03*
-D23*
-X007528Y005029D03*
-X007843Y005029D03*
-X008158Y005029D03*
-X008473Y005029D03*
-X008788Y005029D03*
-X009103Y005029D03*
-X009418Y005029D03*
-X009733Y005029D03*
-X009733Y008257D03*
+X004763Y006801D03*
+X004763Y007116D03*
+X005373Y007116D03*
+D24*
+X007528Y008257D03*
+X007843Y008257D03*
+X008158Y008257D03*
+X008473Y008257D03*
+X008788Y008257D03*
+X009103Y008257D03*
 X009418Y008257D03*
-X009103Y008257D03*
-X008788Y008257D03*
-X008473Y008257D03*
-X008158Y008257D03*
-X007843Y008257D03*
-X007528Y008257D03*
-D24*
-X007016Y007746D03*
-X007016Y007431D03*
-X007016Y007116D03*
-X007016Y006801D03*
+X009733Y008257D03*
+X009733Y005029D03*
+X009418Y005029D03*
+X009103Y005029D03*
+X008788Y005029D03*
+X008473Y005029D03*
+X008158Y005029D03*
+X007843Y005029D03*
+X007528Y005029D03*
+D25*
+X007016Y005541D03*
+X007016Y005856D03*
+X007016Y006171D03*
 X007016Y006486D03*
-X007016Y006171D03*
-X007016Y005856D03*
-X007016Y005541D03*
-X010245Y005541D03*
-X010245Y005856D03*
+X007016Y006801D03*
+X007016Y007116D03*
+X007016Y007431D03*
+X007016Y007746D03*
+X010245Y007746D03*
+X010245Y007431D03*
+X010245Y007116D03*
+X010245Y006801D03*
+X010245Y006486D03*
 X010245Y006171D03*
-X010245Y006486D03*
-X010245Y006801D03*
-X010245Y007116D03*
-X010245Y007431D03*
-X010245Y007746D03*
+X010245Y005856D03*
+X010245Y005541D03*
 M02*