diff --git a/ZonCoffeeSchematic.GTS b/ZonCoffeeSchematic.GTS
--- a/ZonCoffeeSchematic.GTS
+++ b/ZonCoffeeSchematic.GTS
@@ -7,145 +7,151 @@ G70*
 %AMOC8*
 5,1,8,0,0,1.08239X$1,22.5*
 %
-%ADD10R,0.0316X0.0946*%
+%ADD10R,0.0946X0.0316*%
 %ADD11R,0.0820X0.0820*%
 %ADD12OC8,0.0820*%
 %ADD13C,0.0820*%
-%ADD14R,0.0580X0.0300*%
-%ADD15R,0.0300X0.0580*%
+%ADD14R,0.0300X0.0580*%
+%ADD15R,0.0580X0.0300*%
 %ADD16R,0.0552X0.0631*%
 %ADD17R,0.0880X0.0880*%
 %ADD18C,0.0880*%
-%ADD19R,0.0560X0.0960*%
-%ADD20R,0.1497X0.0946*%
-%ADD21R,0.0395X0.0552*%
-%ADD22R,0.0513X0.0474*%
-%ADD23C,0.0640*%
-%ADD24C,0.1380*%
+%ADD19R,0.0552X0.0395*%
+%ADD20R,0.0395X0.0552*%
+%ADD21R,0.0474X0.0513*%
+%ADD22C,0.0640*%
+%ADD23R,0.0513X0.0474*%
+%ADD24C,0.0730*%
+%ADD25C,0.1380*%
+%ADD26C,0.0720*%
 D10*
-X007751Y004618D03*
-X008251Y004618D03*
-X008751Y004618D03*
-X009251Y004618D03*
-X009251Y006665D03*
-X008751Y006665D03*
-X008251Y006665D03*
-X007751Y006665D03*
+X012537Y006932D03*
+X012537Y007432D03*
+X012537Y007932D03*
+X012537Y008432D03*
+X014585Y008432D03*
+X014585Y007932D03*
+X014585Y007432D03*
+X014585Y006932D03*
 D11*
-X001501Y006641D03*
-X015001Y002641D03*
-X017501Y007141D03*
+X017561Y007182D03*
+X011061Y002682D03*
+X001561Y013682D03*
 D12*
-X014001Y002641D03*
-X014001Y001641D03*
-X015001Y001641D03*
-X013001Y001641D03*
-X013001Y002641D03*
+X009061Y002682D03*
+X010061Y002682D03*
+X010061Y001682D03*
+X009061Y001682D03*
+X011061Y001682D03*
 D13*
-X011001Y001641D03*
-X010001Y001641D03*
-X017501Y004141D03*
-X017501Y005141D03*
-X017501Y006141D03*
-X017501Y008641D03*
-X017501Y009641D03*
-X017501Y010641D03*
-X017501Y012141D03*
-X017501Y013141D03*
-X014281Y012031D03*
-X014281Y010251D03*
-X011721Y010251D03*
-X011721Y012031D03*
-X012001Y016141D03*
-X013001Y016141D03*
-X014001Y016141D03*
-X015001Y016141D03*
-X011001Y016141D03*
-X010001Y016141D03*
-X001501Y013641D03*
-X001501Y012641D03*
-X001501Y011641D03*
-X001501Y010641D03*
-X001501Y009641D03*
-X001501Y008641D03*
-X001501Y007641D03*
+X006561Y001682D03*
+X005561Y001682D03*
+X001561Y006682D03*
+X001561Y007682D03*
+X001561Y008682D03*
+X001561Y009682D03*
+X001561Y010682D03*
+X001561Y011682D03*
+X001561Y012682D03*
+X010061Y016182D03*
+X011061Y016182D03*
+X012061Y016182D03*
+X013061Y016182D03*
+X014061Y016182D03*
+X015061Y016182D03*
+X017561Y013182D03*
+X017561Y012182D03*
+X017561Y010682D03*
+X017561Y009682D03*
+X017561Y008682D03*
+X017561Y006182D03*
+X017561Y005182D03*
+X017561Y004182D03*
+X014841Y010292D03*
+X014841Y012072D03*
+X012281Y012072D03*
+X012281Y010292D03*
 D14*
-X011311Y007744D03*
-X011311Y007429D03*
-X011311Y007114D03*
-X011311Y006799D03*
-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*
 D15*
-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*
 D16*
-X002591Y005141D03*
-X001410Y005141D03*
-X001410Y003641D03*
-X002591Y003641D03*
+X002652Y005182D03*
+X001471Y005182D03*
+X001471Y003682D03*
+X002652Y003682D03*
 D17*
-X007001Y001641D03*
-X005501Y016141D03*
+X014561Y002182D03*
+X005561Y016182D03*
 D18*
-X006879Y016141D03*
-X005623Y001641D03*
+X006939Y016182D03*
+X013183Y002182D03*
 D19*
-X008091Y011421D03*
-X009001Y011421D03*
-X009911Y011421D03*
+X012061Y014327D03*
+X012061Y015036D03*
 D20*
-X009001Y013861D03*
+X005915Y005182D03*
+X005207Y005182D03*
+X005207Y004182D03*
+X005915Y004182D03*
 D21*
-X011146Y014141D03*
-X011855Y014141D03*
-X005855Y005141D03*
-X005146Y005141D03*
-X005146Y004141D03*
-X005855Y004141D03*
+X006561Y008847D03*
+X006561Y009516D03*
+X006561Y010347D03*
+X006561Y011016D03*
+X015061Y014347D03*
+X015061Y015016D03*
 D22*
-X007666Y008141D03*
-X008335Y008141D03*
-X008335Y009141D03*
-X007666Y009141D03*
-X007666Y010141D03*
-X008335Y010141D03*
-X006335Y012641D03*
-X005666Y012641D03*
-X005666Y013641D03*
-X006335Y013641D03*
-X014166Y014141D03*
-X014835Y014141D03*
+X005061Y010182D03*
+X005061Y008182D03*
 D23*
-X005501Y010641D03*
-X005501Y008641D03*
+X013226Y005682D03*
+X013896Y005682D03*
 D24*
-X002001Y001641D03*
-X017251Y001641D03*
-X017251Y016141D03*
-X002001Y016141D03*
+X010561Y011182D03*
+X009561Y011182D03*
+X008061Y011182D03*
+X008061Y010182D03*
+D25*
+X002061Y001682D03*
+X017311Y001682D03*
+X017311Y016182D03*
+X002061Y016182D03*
+D26*
+X005561Y013002D02*
+X005561Y012362D01*
+X006561Y012362D02*
+X006561Y013002D01*
+X007561Y013002D02*
+X007561Y012362D01*
 M02*