diff --git a/CAM/zoncoffee.GTP b/CAM/zoncoffee.GTP
--- a/CAM/zoncoffee.GTP
+++ b/CAM/zoncoffee.GTP
@@ -25,279 +25,279 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD25R,0.0354X0.0315*%
 %ADD26R,0.0355X0.0180*%
 D10*
-X004510Y003328D02*
-X004510Y008318D01*
-X022630Y008318D01*
-X022630Y003328D01*
-X004510Y003328D01*
-X017363Y005828D02*
-X017365Y005852D01*
-X017371Y005875D01*
-X017380Y005897D01*
-X017393Y005917D01*
-X017408Y005935D01*
-X017427Y005950D01*
-X017448Y005962D01*
-X017470Y005970D01*
-X017493Y005975D01*
-X017517Y005976D01*
-X017541Y005973D01*
-X017563Y005966D01*
-X017585Y005956D01*
-X017605Y005943D01*
-X017622Y005926D01*
-X017636Y005907D01*
-X017647Y005886D01*
-X017655Y005863D01*
-X017659Y005840D01*
-X017659Y005816D01*
-X017655Y005793D01*
-X017647Y005770D01*
-X017636Y005749D01*
-X017622Y005730D01*
-X017605Y005713D01*
-X017585Y005700D01*
-X017563Y005690D01*
-X017541Y005683D01*
-X017517Y005680D01*
-X017493Y005681D01*
-X017470Y005686D01*
-X017448Y005694D01*
-X017427Y005706D01*
-X017408Y005721D01*
-X017393Y005739D01*
-X017380Y005759D01*
-X017371Y005781D01*
-X017365Y005804D01*
-X017363Y005828D01*
-X018801Y005828D02*
-X018803Y005856D01*
-X018809Y005884D01*
-X018818Y005910D01*
-X018831Y005936D01*
-X018847Y005959D01*
-X018867Y005979D01*
-X018889Y005997D01*
-X018913Y006012D01*
-X018939Y006023D01*
-X018966Y006031D01*
-X018994Y006035D01*
-X019022Y006035D01*
-X019050Y006031D01*
-X019077Y006023D01*
-X019103Y006012D01*
-X019127Y005997D01*
-X019149Y005979D01*
-X019169Y005959D01*
-X019185Y005936D01*
-X019198Y005910D01*
-X019207Y005884D01*
-X019213Y005856D01*
-X019215Y005828D01*
-X019213Y005800D01*
-X019207Y005772D01*
-X019198Y005746D01*
-X019185Y005720D01*
-X019169Y005697D01*
-X019149Y005677D01*
-X019127Y005659D01*
-X019103Y005644D01*
-X019077Y005633D01*
-X019050Y005625D01*
-X019022Y005621D01*
-X018994Y005621D01*
-X018966Y005625D01*
-X018939Y005633D01*
-X018913Y005644D01*
-X018889Y005659D01*
-X018867Y005677D01*
-X018847Y005697D01*
-X018831Y005720D01*
-X018818Y005746D01*
-X018809Y005772D01*
-X018803Y005800D01*
-X018801Y005828D01*
+X004510Y003979D02*
+X004510Y008969D01*
+X022630Y008969D01*
+X022630Y003979D01*
+X004510Y003979D01*
+X017363Y006479D02*
+X017365Y006503D01*
+X017371Y006526D01*
+X017380Y006548D01*
+X017393Y006568D01*
+X017408Y006586D01*
+X017427Y006601D01*
+X017448Y006613D01*
+X017470Y006621D01*
+X017493Y006626D01*
+X017517Y006627D01*
+X017541Y006624D01*
+X017563Y006617D01*
+X017585Y006607D01*
+X017605Y006594D01*
+X017622Y006577D01*
+X017636Y006558D01*
+X017647Y006537D01*
+X017655Y006514D01*
+X017659Y006491D01*
+X017659Y006467D01*
+X017655Y006444D01*
+X017647Y006421D01*
+X017636Y006400D01*
+X017622Y006381D01*
+X017605Y006364D01*
+X017585Y006351D01*
+X017563Y006341D01*
+X017541Y006334D01*
+X017517Y006331D01*
+X017493Y006332D01*
+X017470Y006337D01*
+X017448Y006345D01*
+X017427Y006357D01*
+X017408Y006372D01*
+X017393Y006390D01*
+X017380Y006410D01*
+X017371Y006432D01*
+X017365Y006455D01*
+X017363Y006479D01*
+X018801Y006479D02*
+X018803Y006507D01*
+X018809Y006535D01*
+X018818Y006561D01*
+X018831Y006587D01*
+X018847Y006610D01*
+X018867Y006630D01*
+X018889Y006648D01*
+X018913Y006663D01*
+X018939Y006674D01*
+X018966Y006682D01*
+X018994Y006686D01*
+X019022Y006686D01*
+X019050Y006682D01*
+X019077Y006674D01*
+X019103Y006663D01*
+X019127Y006648D01*
+X019149Y006630D01*
+X019169Y006610D01*
+X019185Y006587D01*
+X019198Y006561D01*
+X019207Y006535D01*
+X019213Y006507D01*
+X019215Y006479D01*
+X019213Y006451D01*
+X019207Y006423D01*
+X019198Y006397D01*
+X019185Y006371D01*
+X019169Y006348D01*
+X019149Y006328D01*
+X019127Y006310D01*
+X019103Y006295D01*
+X019077Y006284D01*
+X019050Y006276D01*
+X019022Y006272D01*
+X018994Y006272D01*
+X018966Y006276D01*
+X018939Y006284D01*
+X018913Y006295D01*
+X018889Y006310D01*
+X018867Y006328D01*
+X018847Y006348D01*
+X018831Y006371D01*
+X018818Y006397D01*
+X018809Y006423D01*
+X018803Y006451D01*
+X018801Y006479D01*
 D11*
-X016828Y004078D03*
-X016316Y004078D03*
-X016316Y003640D03*
-X016828Y003640D03*
-X013390Y004078D03*
-X012879Y004078D03*
-X012879Y004515D03*
-X013390Y004515D03*
-X013015Y004953D03*
-X012504Y004953D03*
-X011390Y006765D03*
-X010879Y006765D03*
-X012691Y007078D03*
-X013203Y007078D03*
-X008265Y008015D03*
-X007754Y008015D03*
-X007504Y007453D03*
-X008015Y007453D03*
-X005515Y007203D03*
-X005004Y007203D03*
-X005004Y007828D03*
-X005515Y007828D03*
-X005390Y004953D03*
-X004879Y004953D03*
-X004879Y004390D03*
-X005390Y004390D03*
-X018754Y007828D03*
-X019265Y007828D03*
-X020441Y003640D03*
-X020953Y003640D03*
+X016828Y004729D03*
+X016828Y004292D03*
+X016316Y004292D03*
+X016316Y004729D03*
+X013390Y004729D03*
+X012879Y004729D03*
+X012879Y005167D03*
+X013015Y005604D03*
+X012504Y005604D03*
+X013390Y005167D03*
+X011390Y007417D03*
+X010879Y007417D03*
+X012691Y007729D03*
+X013203Y007729D03*
+X008265Y008667D03*
+X007754Y008667D03*
+X007504Y008104D03*
+X008015Y008104D03*
+X005515Y007854D03*
+X005004Y007854D03*
+X005004Y008479D03*
+X005515Y008479D03*
+X005390Y005604D03*
+X004879Y005604D03*
+X004879Y005042D03*
+X005390Y005042D03*
+X018754Y008479D03*
+X019265Y008479D03*
+X020441Y004292D03*
+X020953Y004292D03*
 D12*
-X018811Y004518D03*
-X018260Y004518D03*
-X017708Y004518D03*
-X017708Y007137D03*
-X018260Y007137D03*
-X018811Y007137D03*
+X018811Y005170D03*
+X018260Y005170D03*
+X017708Y005170D03*
+X017708Y007789D03*
+X018260Y007789D03*
+X018811Y007789D03*
 D13*
-X019874Y005828D03*
-X016645Y005828D03*
+X019874Y006479D03*
+X016645Y006479D03*
 D14*
-X021091Y005828D03*
-X021091Y006083D03*
-X021091Y006339D03*
-X021091Y005572D03*
-X021091Y005316D03*
+X021091Y006479D03*
+X021091Y006224D03*
+X021091Y005968D03*
+X021091Y006735D03*
+X021091Y006991D03*
 D15*
-X022135Y004253D03*
-X022135Y007402D03*
+X022135Y008054D03*
+X022135Y004905D03*
 D16*
-X022135Y006328D03*
-X022135Y005328D03*
+X022135Y005979D03*
+X022135Y006979D03*
 D17*
-X015635Y004761D03*
-X015135Y004761D03*
-X014635Y004761D03*
-X014135Y004761D03*
-X014135Y006887D03*
-X014635Y006887D03*
-X015135Y006887D03*
-X015635Y006887D03*
+X015635Y007539D03*
+X015135Y007539D03*
+X014635Y007539D03*
+X014135Y007539D03*
+X014135Y005413D03*
+X014635Y005413D03*
+X015135Y005413D03*
+X015635Y005413D03*
 D18*
-X013384Y006464D03*
-X013010Y006464D03*
-X012635Y006464D03*
-X012635Y005441D03*
-X013384Y005441D03*
+X013384Y006093D03*
+X012635Y006093D03*
+X012635Y007116D03*
+X013010Y007116D03*
+X013384Y007116D03*
 D19*
-X009994Y004255D03*
-X009797Y004255D03*
-X009600Y004255D03*
-X009403Y004255D03*
-X009206Y004255D03*
-X009010Y004255D03*
-X008813Y004255D03*
-X008616Y004255D03*
-X008419Y004255D03*
-X008222Y004255D03*
-X008025Y004255D03*
-X007828Y004255D03*
-X007828Y006972D03*
-X008025Y006972D03*
-X008222Y006972D03*
-X008419Y006972D03*
-X008616Y006972D03*
-X008813Y006972D03*
-X009010Y006972D03*
-X009206Y006972D03*
-X009403Y006972D03*
-X009600Y006972D03*
-X009797Y006972D03*
-X009994Y006972D03*
+X009994Y007624D03*
+X009797Y007624D03*
+X009600Y007624D03*
+X009403Y007624D03*
+X009206Y007624D03*
+X009010Y007624D03*
+X008813Y007624D03*
+X008616Y007624D03*
+X008419Y007624D03*
+X008222Y007624D03*
+X008025Y007624D03*
+X007828Y007624D03*
+X007828Y004907D03*
+X008025Y004907D03*
+X008222Y004907D03*
+X008419Y004907D03*
+X008616Y004907D03*
+X008813Y004907D03*
+X009010Y004907D03*
+X009206Y004907D03*
+X009403Y004907D03*
+X009600Y004907D03*
+X009797Y004907D03*
+X009994Y004907D03*
 D20*
-X010269Y006696D03*
-X010269Y006499D03*
-X010269Y006302D03*
-X010269Y006106D03*
-X010269Y005909D03*
-X010269Y005712D03*
-X010269Y005515D03*
-X010269Y005318D03*
-X010269Y005121D03*
-X010269Y004924D03*
-X010269Y004728D03*
-X010269Y004531D03*
-X007553Y004531D03*
-X007553Y004728D03*
-X007553Y004924D03*
-X007553Y005121D03*
-X007553Y005318D03*
-X007553Y005515D03*
-X007553Y005712D03*
-X007553Y005909D03*
-X007553Y006106D03*
-X007553Y006302D03*
-X007553Y006499D03*
-X007553Y006696D03*
+X010269Y005183D03*
+X010269Y005380D03*
+X010269Y005576D03*
+X010269Y005773D03*
+X010269Y005970D03*
+X010269Y006167D03*
+X010269Y006364D03*
+X010269Y006561D03*
+X010269Y006758D03*
+X010269Y006954D03*
+X010269Y007151D03*
+X010269Y007348D03*
+X007553Y007348D03*
+X007553Y007151D03*
+X007553Y006954D03*
+X007553Y006758D03*
+X007553Y006561D03*
+X007553Y006364D03*
+X007553Y006167D03*
+X007553Y005970D03*
+X007553Y005773D03*
+X007553Y005576D03*
+X007553Y005380D03*
+X007553Y005183D03*
 D21*
-X008911Y005613D03*
+X008911Y006265D03*
 D22*
-X019872Y004535D02*
-X020148Y004535D01*
-X019872Y004535D02*
-X019872Y004811D01*
-X020148Y004811D01*
-X020148Y004535D01*
-X020148Y004652D02*
-X019872Y004652D01*
-X019872Y004769D02*
-X020148Y004769D01*
-X020148Y003844D02*
-X019872Y003844D01*
-X019872Y004120D01*
-X020148Y004120D01*
-X020148Y003844D01*
-X020148Y003961D02*
-X019872Y003961D01*
-X019872Y004078D02*
-X020148Y004078D01*
-X020148Y007120D02*
-X019872Y007120D01*
-X020148Y007120D02*
-X020148Y006844D01*
-X019872Y006844D01*
-X019872Y007120D01*
-X019872Y006961D02*
-X020148Y006961D01*
-X020148Y007078D02*
-X019872Y007078D01*
-X019872Y007811D02*
-X020148Y007811D01*
-X020148Y007535D01*
-X019872Y007535D01*
-X019872Y007811D01*
-X019872Y007652D02*
-X020148Y007652D01*
-X020148Y007769D02*
-X019872Y007769D01*
+X019872Y005187D02*
+X020148Y005187D01*
+X019872Y005187D02*
+X019872Y005463D01*
+X020148Y005463D01*
+X020148Y005187D01*
+X020148Y005304D02*
+X019872Y005304D01*
+X019872Y005421D02*
+X020148Y005421D01*
+X020148Y004496D02*
+X019872Y004496D01*
+X019872Y004772D01*
+X020148Y004772D01*
+X020148Y004496D01*
+X020148Y004613D02*
+X019872Y004613D01*
+X019872Y004730D02*
+X020148Y004730D01*
+X020148Y007772D02*
+X019872Y007772D01*
+X020148Y007772D02*
+X020148Y007496D01*
+X019872Y007496D01*
+X019872Y007772D01*
+X019872Y007613D02*
+X020148Y007613D01*
+X020148Y007730D02*
+X019872Y007730D01*
+X019872Y008463D02*
+X020148Y008463D01*
+X020148Y008187D01*
+X019872Y008187D01*
+X019872Y008463D01*
+X019872Y008304D02*
+X020148Y008304D01*
+X020148Y008421D02*
+X019872Y008421D01*
 D23*
-X021359Y003640D03*
-X021871Y003640D03*
+X021359Y004292D03*
+X021871Y004292D03*
 D24*
-X016260Y006697D03*
-X016260Y007208D03*
-X012010Y006083D03*
-X012010Y005572D03*
-X010135Y007509D03*
-X010135Y008021D03*
+X016260Y007349D03*
+X016260Y007860D03*
+X012010Y006735D03*
+X012010Y006224D03*
+X010135Y008161D03*
+X010135Y008673D03*
 D25*
-X009584Y008011D03*
-X008935Y008011D03*
-X008935Y007519D03*
-X009584Y007519D03*
+X009584Y008663D03*
+X009584Y008171D03*
+X008935Y008171D03*
+X008935Y008663D03*
 D26*
-X005530Y006418D03*
-X005530Y006108D03*
-X005530Y005798D03*
-X005530Y005488D03*
-X004865Y005488D03*
-X004865Y005798D03*
-X004865Y006108D03*
-X004865Y006418D03*
+X005530Y007069D03*
+X005530Y006759D03*
+X005530Y006449D03*
+X005530Y006139D03*
+X004865Y006139D03*
+X004865Y006449D03*
+X004865Y006759D03*
+X004865Y007069D03*
 M02*