diff --git a/CAM/zoncoffee.GTO b/CAM/zoncoffee.GTO
--- a/CAM/zoncoffee.GTO
+++ b/CAM/zoncoffee.GTO
@@ -14,9 +14,9 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD14C,0.0020*%
 %ADD15C,0.0040*%
 %ADD16R,0.0050X0.0305*%
-%ADD17C,0.0160*%
-%ADD18R,0.0160X0.0280*%
-%ADD19R,0.0177X0.0177*%
+%ADD17C,0.0220*%
+%ADD18C,0.0160*%
+%ADD19R,0.0160X0.0280*%
 %ADD20R,0.0100X0.0020*%
 %ADD21R,0.0160X0.0020*%
 %ADD22R,0.0180X0.0020*%
@@ -33,6 +33,7 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD33R,0.0260X0.0020*%
 %ADD34R,0.0020X0.0020*%
 %ADD35R,0.0040X0.0020*%
+%ADD36C,0.0060*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1437,37 +1438,37 @@ X016255Y006800D01*
 X016255Y005300D01*
 X014255Y005300D01*
 X014255Y006800D01*
-X009543Y005406D02*
-X009498Y005361D01*
-X009318Y005361D01*
-X009363Y005316D02*
-X009363Y005406D01*
-X009363Y005205D02*
-X009363Y005160D01*
-X009453Y005070D01*
-X009543Y005070D02*
-X009363Y005070D01*
-X009408Y004956D02*
-X009543Y004956D01*
-X009543Y004820D01*
-X009498Y004775D01*
-X009453Y004820D01*
-X009453Y004956D01*
-X009408Y004956D02*
-X009363Y004911D01*
-X009363Y004820D01*
-X009363Y004661D02*
-X009543Y004661D01*
-X009543Y004526D01*
-X009498Y004481D01*
-X009363Y004481D01*
+X010949Y005468D02*
+X010904Y005423D01*
+X010724Y005423D01*
+X010769Y005378D02*
+X010769Y005468D01*
+X010769Y005268D02*
+X010769Y005223D01*
+X010859Y005133D01*
+X010949Y005133D02*
+X010769Y005133D01*
+X010814Y005018D02*
+X010949Y005018D01*
+X010949Y004883D01*
+X010904Y004838D01*
+X010859Y004883D01*
+X010859Y005018D01*
+X010814Y005018D02*
+X010769Y004973D01*
+X010769Y004883D01*
+X010769Y004723D02*
+X010949Y004723D01*
+X010949Y004588D01*
+X010904Y004543D01*
+X010769Y004543D01*
 D12*
-X012383Y006349D02*
-X012383Y006687D01*
 X012837Y006199D02*
 X013049Y006199D01*
 X013503Y006349D02*
 X013503Y006687D01*
+X012383Y006687D02*
+X012383Y006349D01*
 X015955Y007581D02*
 X015957Y007594D01*
 X015962Y007607D01*
@@ -1558,44 +1559,93 @@ X020571Y005305D01*
 X021201Y005305D01*
 X022264Y005305D02*
 X022264Y007982D01*
+X009955Y008581D02*
+X009957Y008594D01*
+X009962Y008607D01*
+X009971Y008618D01*
+X009982Y008625D01*
+X009995Y008630D01*
+X010008Y008631D01*
+X010022Y008628D01*
+X010034Y008622D01*
+X010044Y008613D01*
+X010051Y008601D01*
+X010055Y008588D01*
+X010055Y008574D01*
+X010051Y008561D01*
+X010044Y008549D01*
+X010034Y008540D01*
+X010022Y008534D01*
+X010008Y008531D01*
+X009995Y008532D01*
+X009982Y008537D01*
+X009971Y008544D01*
+X009962Y008555D01*
+X009957Y008568D01*
+X009955Y008581D01*
 D13*
-X019886Y006880D02*
-X019886Y006296D01*
-X019792Y006202D01*
-X019808Y006187D01*
-X019595Y005974D01*
-X019603Y005965D02*
-X019529Y005892D01*
-X019603Y005965D02*
+X016500Y006991D02*
+X016500Y006407D01*
+X016638Y006269D01*
+X016587Y006217D01*
+X016620Y006184D01*
+X016954Y005850D02*
+X017009Y005795D01*
+X017344Y005460D02*
+X017399Y005405D01*
+X017734Y005070D02*
+X017767Y005037D01*
+X017818Y005089D01*
+X017956Y004950D01*
+X018541Y004950D01*
+X018634Y005044D01*
+X018649Y005029D01*
+X018862Y005242D01*
+X018871Y005233D01*
+X018944Y005307D01*
+X018862Y005242D02*
+X018790Y005314D01*
+X018863Y005387D01*
+X019529Y005892D02*
+X019603Y005965D01*
 X019522Y006046D01*
 X019449Y005973D01*
-X018577Y006457D02*
-X018577Y006830D01*
-X018575Y006856D01*
-X018570Y006881D01*
-X018562Y006905D01*
-X018551Y006929D01*
-X018536Y006950D01*
-X018519Y006969D01*
-X018500Y006986D01*
-X018479Y007001D01*
-X018455Y007012D01*
-X018431Y007020D01*
-X018406Y007025D01*
-X018380Y007027D01*
-X018006Y007027D01*
-X017980Y007025D01*
-X017955Y007020D01*
-X017931Y007012D01*
-X017908Y007001D01*
-X017886Y006986D01*
-X017867Y006969D01*
-X017850Y006950D01*
-X017835Y006929D01*
-X017824Y006905D01*
-X017816Y006881D01*
-X017811Y006856D01*
-X017809Y006830D01*
+X019595Y005974D02*
+X019808Y006187D01*
+X019792Y006202D01*
+X019886Y006296D01*
+X019886Y006880D01*
+X019748Y007018D01*
+X019799Y007069D01*
+X019766Y007102D01*
+X019431Y007437D02*
+X019362Y007506D01*
+X019056Y007813D02*
+X018987Y007882D01*
+X018619Y008250D02*
+X018567Y008198D01*
+X018429Y008336D01*
+X017845Y008336D01*
+X017752Y008243D01*
+X017736Y008258D01*
+X017523Y008045D01*
+X017596Y007973D01*
+X017522Y007899D01*
+X017441Y007980D02*
+X017515Y008053D01*
+X017523Y008045D01*
+X017410Y007586D02*
+X017388Y007448D01*
+X017251Y007426D01*
+X016937Y007314D02*
+X016864Y007240D01*
+X016783Y007321D01*
+X016856Y007395D01*
+X016791Y007313D02*
+X016578Y007100D01*
+X016594Y007085D01*
+X016500Y006991D01*
+X017809Y006830D02*
 X017809Y006457D01*
 X017811Y006431D01*
 X017816Y006406D01*
@@ -1624,6 +1674,32 @@ X018562Y006382D01*
 X018570Y006406D01*
 X018575Y006431D01*
 X018577Y006457D01*
+X018577Y006830D01*
+X018575Y006856D01*
+X018570Y006881D01*
+X018562Y006905D01*
+X018551Y006929D01*
+X018536Y006950D01*
+X018519Y006969D01*
+X018500Y006986D01*
+X018479Y007001D01*
+X018455Y007012D01*
+X018431Y007020D01*
+X018406Y007025D01*
+X018380Y007027D01*
+X018006Y007027D01*
+X017980Y007025D01*
+X017955Y007020D01*
+X017931Y007012D01*
+X017908Y007001D01*
+X017886Y006986D01*
+X017867Y006969D01*
+X017850Y006950D01*
+X017835Y006929D01*
+X017824Y006905D01*
+X017816Y006881D01*
+X017811Y006856D01*
+X017809Y006830D01*
 X017469Y006643D02*
 X017471Y006696D01*
 X017477Y006750D01*
@@ -1710,61 +1786,8 @@ X017487Y006484D01*
 X017477Y006536D01*
 X017471Y006590D01*
 X017469Y006643D01*
-X016638Y006269D02*
-X016500Y006407D01*
-X016500Y006991D01*
-X016594Y007085D01*
-X016578Y007100D01*
-X016791Y007313D01*
-X016783Y007321D02*
-X016864Y007240D01*
-X016937Y007314D01*
-X016856Y007395D02*
-X016783Y007321D01*
-X017251Y007426D02*
-X017388Y007448D01*
-X017410Y007586D01*
-X017522Y007899D02*
-X017596Y007973D01*
-X017523Y008045D01*
-X017736Y008258D01*
-X017752Y008243D01*
-X017845Y008336D01*
-X018429Y008336D01*
-X018567Y008198D01*
+X018652Y008216D02*
 X018619Y008250D01*
-X018652Y008216D01*
-X018987Y007882D02*
-X019056Y007813D01*
-X019362Y007506D02*
-X019431Y007437D01*
-X019766Y007102D02*
-X019799Y007069D01*
-X019748Y007018D01*
-X019886Y006880D01*
-X017523Y008045D02*
-X017515Y008053D01*
-X017441Y007980D01*
-X016638Y006269D02*
-X016587Y006217D01*
-X016620Y006184D01*
-X016954Y005850D02*
-X017009Y005795D01*
-X017344Y005460D02*
-X017399Y005405D01*
-X017734Y005070D02*
-X017767Y005037D01*
-X017818Y005089D01*
-X017956Y004950D01*
-X018541Y004950D01*
-X018634Y005044D01*
-X018649Y005029D01*
-X018862Y005242D01*
-X018871Y005233D01*
-X018944Y005307D01*
-X018862Y005242D02*
-X018790Y005314D01*
-X018863Y005387D01*
 D14*
 X017396Y006643D02*
 X017398Y006699D01*
@@ -1980,77 +2003,65 @@ X005363Y007254D01*
 D16*
 X017413Y008641D03*
 D17*
-X015255Y007749D02*
-X015255Y007725D01*
-X013892Y006612D02*
-X013868Y006612D01*
-X012943Y005499D02*
-X012943Y005475D01*
-X012880Y007756D02*
-X012880Y007780D01*
-X011974Y007780D02*
-X011974Y007756D01*
-X009755Y008538D02*
-X009755Y008562D01*
-X005068Y008280D02*
-X005068Y008256D01*
+X012974Y007687D02*
+X012974Y007663D01*
+D18*
+X011787Y007694D02*
+X011787Y007718D01*
+X013868Y006612D02*
+X013892Y006612D01*
+X015255Y007725D02*
+X015255Y007749D01*
+X012943Y005405D02*
+X012943Y005381D01*
+X006693Y008225D02*
+X006693Y008249D01*
+X005068Y008256D02*
+X005068Y008280D01*
 X005068Y007655D02*
 X005068Y007631D01*
-X008255Y005655D02*
-X008255Y005631D01*
-D18*
+X006255Y004905D02*
+X006255Y004881D01*
+D19*
 X005068Y005643D03*
 X019943Y008018D03*
-D19*
-X011038Y007582D03*
 D20*
-X018813Y004856D03*
-X018813Y004836D03*
-X018793Y004736D03*
-X018793Y004716D03*
-X018773Y004696D03*
-X018773Y004676D03*
-X018773Y004656D03*
-X018773Y004636D03*
-X018773Y004616D03*
-X018753Y004596D03*
-X018753Y004576D03*
-X018753Y004556D03*
-X018773Y004476D03*
-X018953Y004496D03*
-X018953Y004516D03*
-X018953Y004536D03*
-X018973Y004556D03*
-X018973Y004576D03*
-X018973Y004596D03*
-X018973Y004616D03*
-X018973Y004636D03*
+X019033Y004936D03*
+X019033Y004916D03*
+X019033Y004896D03*
+X019033Y004876D03*
+X019033Y004856D03*
+X019013Y004836D03*
+X019013Y004816D03*
+X018993Y004716D03*
+X018993Y004696D03*
+X018993Y004676D03*
 X018993Y004656D03*
-X018993Y004676D03*
-X018993Y004696D03*
-X018993Y004716D03*
-X019013Y004816D03*
-X019013Y004836D03*
-X019033Y004856D03*
-X019033Y004876D03*
-X019033Y004896D03*
-X019033Y004916D03*
-X019033Y004936D03*
-X019153Y004816D03*
-X019193Y004716D03*
+X018973Y004636D03*
+X018973Y004616D03*
+X018973Y004596D03*
+X018973Y004576D03*
+X018973Y004556D03*
+X018953Y004536D03*
+X018953Y004516D03*
+X018953Y004496D03*
+X019133Y004496D03*
+X019153Y004516D03*
+X019153Y004536D03*
+X019153Y004556D03*
+X019153Y004576D03*
+X019153Y004596D03*
+X019173Y004616D03*
+X019173Y004636D03*
+X019173Y004656D03*
+X019173Y004676D03*
 X019173Y004696D03*
-X019173Y004676D03*
-X019173Y004656D03*
-X019173Y004636D03*
-X019173Y004616D03*
-X019153Y004596D03*
-X019153Y004576D03*
-X019153Y004556D03*
-X019153Y004536D03*
-X019153Y004516D03*
-X019133Y004496D03*
+X019193Y004716D03*
+X019153Y004816D03*
+X019353Y004716D03*
+X019373Y004736D03*
+X019333Y004636D03*
 X019313Y004596D03*
-X019333Y004636D03*
 X019333Y004556D03*
 X019393Y004476D03*
 X019653Y004496D03*
@@ -2068,8 +2079,10 @@ X019693Y004716D03*
 X019533Y004716D03*
 X019533Y004736D03*
 X019473Y004816D03*
-X019373Y004736D03*
-X019353Y004716D03*
+X019913Y004716D03*
+X019913Y004696D03*
+X019913Y004676D03*
+X019913Y004656D03*
 X019893Y004636D03*
 X019893Y004616D03*
 X019893Y004596D03*
@@ -2078,18 +2091,14 @@ X019893Y004556D03*
 X019873Y004536D03*
 X019873Y004516D03*
 X019873Y004496D03*
-X019913Y004656D03*
-X019913Y004676D03*
-X019913Y004696D03*
-X019913Y004716D03*
-X020073Y004636D03*
+X020053Y004496D03*
+X020053Y004516D03*
+X020053Y004536D03*
+X020073Y004556D03*
+X020073Y004576D03*
+X020073Y004596D03*
 X020073Y004616D03*
-X020073Y004596D03*
-X020073Y004576D03*
-X020073Y004556D03*
-X020053Y004536D03*
-X020053Y004516D03*
-X020053Y004496D03*
+X020073Y004636D03*
 X020093Y004656D03*
 X020093Y004676D03*
 X020093Y004696D03*
@@ -2108,19 +2117,32 @@ X020273Y004696D03*
 X020273Y004716D03*
 X020273Y004736D03*
 X020653Y004796D03*
+X018813Y004836D03*
+X018813Y004856D03*
+X018793Y004736D03*
+X018793Y004716D03*
+X018773Y004696D03*
+X018773Y004676D03*
+X018773Y004656D03*
+X018773Y004636D03*
+X018773Y004616D03*
+X018753Y004596D03*
+X018753Y004576D03*
+X018753Y004556D03*
+X018773Y004476D03*
 D21*
-X020243Y004796D03*
+X018783Y004496D03*
+X018783Y004516D03*
 X019463Y004796D03*
-X018783Y004516D03*
-X018783Y004496D03*
+X020243Y004796D03*
 D22*
+X019753Y004796D03*
+X019733Y004776D03*
+X019733Y004756D03*
+X019733Y004736D03*
+X019393Y004496D03*
 X018813Y004776D03*
 X018813Y004796D03*
-X019393Y004496D03*
-X019733Y004736D03*
-X019733Y004756D03*
-X019733Y004776D03*
-X019753Y004796D03*
 D23*
 X019403Y004536D03*
 X019403Y004516D03*
@@ -2188,4 +2210,59 @@ D35*
 X020643Y004836D03*
 X020483Y004936D03*
 X020463Y004956D03*
+D36*
+X009904Y005446D02*
+X009827Y005370D01*
+X007433Y005370D01*
+X007357Y005446D01*
+X007357Y007840D01*
+X007433Y007917D01*
+X009827Y007917D01*
+X009904Y007840D01*
+X009904Y005446D01*
+X009376Y007576D02*
+X009378Y007603D01*
+X009384Y007629D01*
+X009393Y007654D01*
+X009406Y007677D01*
+X009422Y007698D01*
+X009441Y007717D01*
+X009462Y007733D01*
+X009485Y007746D01*
+X009510Y007755D01*
+X009536Y007761D01*
+X009563Y007763D01*
+X009590Y007761D01*
+X009616Y007755D01*
+X009641Y007746D01*
+X009664Y007733D01*
+X009685Y007717D01*
+X009704Y007698D01*
+X009720Y007677D01*
+X009733Y007654D01*
+X009742Y007629D01*
+X009748Y007603D01*
+X009750Y007576D01*
+X009748Y007549D01*
+X009742Y007523D01*
+X009733Y007498D01*
+X009720Y007475D01*
+X009704Y007454D01*
+X009685Y007435D01*
+X009664Y007419D01*
+X009641Y007406D01*
+X009616Y007397D01*
+X009590Y007391D01*
+X009563Y007389D01*
+X009536Y007391D01*
+X009510Y007397D01*
+X009485Y007406D01*
+X009462Y007419D01*
+X009441Y007435D01*
+X009422Y007454D01*
+X009406Y007475D01*
+X009393Y007498D01*
+X009384Y007523D01*
+X009378Y007549D01*
+X009376Y007576D01*
 M02*