diff --git a/ZonCoffeeSchematic.GBS b/ZonCoffeeSchematic.GBS
--- a/ZonCoffeeSchematic.GBS
+++ b/ZonCoffeeSchematic.GBS
@@ -13,57 +13,71 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD13R,0.0880X0.0880*%
 %ADD14C,0.0880*%
 %ADD15C,0.0640*%
-%ADD16C,0.1380*%
+%ADD16C,0.0730*%
+%ADD17C,0.1380*%
+%ADD18C,0.0720*%
 D10*
-X001501Y006641D03*
-X015001Y002641D03*
-X017501Y007141D03*
+X011061Y002682D03*
+X017561Y007182D03*
+X001561Y013682D03*
 D11*
-X014001Y002641D03*
-X014001Y001641D03*
-X015001Y001641D03*
-X013001Y001641D03*
-X013001Y002641D03*
+X009061Y002682D03*
+X010061Y002682D03*
+X010061Y001682D03*
+X009061Y001682D03*
+X011061Y001682D03*
 D12*
-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*
 D13*
-X007001Y001641D03*
-X005501Y016141D03*
+X005561Y016182D03*
+X014561Y002182D03*
 D14*
-X006879Y016141D03*
-X005623Y001641D03*
+X013183Y002182D03*
+X006939Y016182D03*
 D15*
-X005501Y008641D03*
-X005501Y010641D03*
+X005061Y010182D03*
+X005061Y008182D03*
 D16*
-X002001Y001641D03*
-X017251Y001641D03*
-X017251Y016141D03*
-X002001Y016141D03*
+X008061Y010182D03*
+X008061Y011182D03*
+X009561Y011182D03*
+X010561Y011182D03*
+D17*
+X002061Y001682D03*
+X017311Y001682D03*
+X017311Y016182D03*
+X002061Y016182D03*
+D18*
+X005561Y013002D02*
+X005561Y012362D01*
+X006561Y012362D02*
+X006561Y013002D01*
+X007561Y013002D02*
+X007561Y012362D01*
 M02*