diff --git a/ZonCoffeeSchematic.GTP b/ZonCoffeeSchematic.GTP
--- a/ZonCoffeeSchematic.GTP
+++ b/ZonCoffeeSchematic.GTP
@@ -7,86 +7,78 @@ G70*
 %AMOC8*
 5,1,8,0,0,1.08239X$1,22.5*
 %
-%ADD10R,0.0236X0.0866*%
-%ADD11R,0.0500X0.0220*%
-%ADD12R,0.0220X0.0500*%
+%ADD10R,0.0866X0.0236*%
+%ADD11R,0.0220X0.0500*%
+%ADD12R,0.0500X0.0220*%
 %ADD13R,0.0472X0.0551*%
-%ADD14R,0.0480X0.0880*%
-%ADD15R,0.1417X0.0866*%
-%ADD16R,0.0315X0.0472*%
+%ADD14R,0.0472X0.0315*%
+%ADD15R,0.0315X0.0472*%
+%ADD16R,0.0394X0.0433*%
 %ADD17R,0.0433X0.0394*%
 D10*
-X007751Y004618D03*
-X008251Y004618D03*
-X008751Y004618D03*
-X009251Y004618D03*
-X009251Y006665D03*
-X008751Y006665D03*
-X008251Y006665D03*
-X007751Y006665D03*
+X012537Y006932D03*
+X012537Y007432D03*
+X012537Y007932D03*
+X012537Y008432D03*
+X014585Y008432D03*
+X014585Y007932D03*
+X014585Y007432D03*
+X014585Y006932D03*
 D11*
-X011311Y006799D03*
-X011311Y007114D03*
-X011311Y007429D03*
-X011311Y007744D03*
-X011311Y006484D03*
-X011311Y006169D03*
-X011311Y005854D03*
-X011311Y005539D03*
-X014691Y005539D03*
-X014691Y005854D03*
-X014691Y006169D03*
-X014691Y006484D03*
-X014691Y006799D03*
-X014691Y007114D03*
-X014691Y007429D03*
-X014691Y007744D03*
+X010163Y008372D03*
+X009849Y008372D03*
+X009534Y008372D03*
+X009219Y008372D03*
+X008904Y008372D03*
+X008589Y008372D03*
+X008274Y008372D03*
+X007959Y008372D03*
+X007959Y004992D03*
+X008274Y004992D03*
+X008589Y004992D03*
+X008904Y004992D03*
+X009219Y004992D03*
+X009534Y004992D03*
+X009849Y004992D03*
+X010163Y004992D03*
 D12*
-X014103Y008331D03*
-X013788Y008331D03*
-X013473Y008331D03*
-X013158Y008331D03*
-X012843Y008331D03*
-X012528Y008331D03*
-X012213Y008331D03*
-X011898Y008331D03*
-X011898Y004951D03*
-X012213Y004951D03*
-X012528Y004951D03*
-X012843Y004951D03*
-X013158Y004951D03*
-X013473Y004951D03*
-X013788Y004951D03*
-X014103Y004951D03*
+X010751Y005579D03*
+X010751Y005894D03*
+X010751Y006209D03*
+X010751Y006524D03*
+X010751Y006839D03*
+X010751Y007154D03*
+X010751Y007469D03*
+X010751Y007784D03*
+X007371Y007784D03*
+X007371Y007469D03*
+X007371Y007154D03*
+X007371Y006839D03*
+X007371Y006524D03*
+X007371Y006209D03*
+X007371Y005894D03*
+X007371Y005579D03*
 D13*
-X001410Y003641D03*
-X002591Y003641D03*
-X002591Y005141D03*
-X001410Y005141D03*
+X001471Y003682D03*
+X002652Y003682D03*
+X002652Y005182D03*
+X001471Y005182D03*
 D14*
-X008091Y011421D03*
-X009001Y011421D03*
-X009911Y011421D03*
+X012061Y014327D03*
+X012061Y015036D03*
 D15*
-X009001Y013861D03*
+X005915Y005182D03*
+X005207Y005182D03*
+X005207Y004182D03*
+X005915Y004182D03*
 D16*
-X011146Y014141D03*
-X011855Y014141D03*
-X005855Y005141D03*
-X005146Y005141D03*
-X005146Y004141D03*
-X005855Y004141D03*
+X006561Y008847D03*
+X006561Y009516D03*
+X006561Y010347D03*
+X006561Y011016D03*
+X015061Y014347D03*
+X015061Y015016D03*
 D17*
-X007666Y008141D03*
-X008335Y008141D03*
-X008335Y009141D03*
-X007666Y009141D03*
-X007666Y010141D03*
-X008335Y010141D03*
-X006335Y012641D03*
-X005666Y012641D03*
-X005666Y013641D03*
-X006335Y013641D03*
-X014166Y014141D03*
-X014835Y014141D03*
+X013896Y005682D03*
+X013226Y005682D03*
 M02*