diff --git a/plot/ulx3s-B.Cu.gbl b/plot/ulx3s-B.Cu.gbl
index eb9b959..59ada68 100644
--- a/plot/ulx3s-B.Cu.gbl
+++ b/plot/ulx3s-B.Cu.gbl
@@ -1,99 +1,99 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-08T13:44:43+02:00*
+G04 #@! TF.CreationDate,2018-06-08T19:59:36+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L4,Bot,Signal*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:43 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:36 2018*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD10R,0.600000X2.100000*%
+%ADD10R,1.550000X0.600000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD11O,0.600000X2.100000*%
-G04 #@! TD*
-G04 #@! TA.AperFunction,ComponentPad*
-%ADD12O,1.727200X1.727200*%
-G04 #@! TD*
-G04 #@! TA.AperFunction,ComponentPad*
-%ADD13R,1.727200X1.727200*%
+%ADD11O,1.550000X0.600000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD14R,0.700000X1.200000*%
-G04 #@! TD*
-G04 #@! TA.AperFunction,ComponentPad*
-%ADD15C,5.500000*%
+%ADD12R,1.000000X0.400000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD16R,1.000000X0.400000*%
-G04 #@! TD*
-G04 #@! TA.AperFunction,ComponentPad*
-%ADD17R,1.727200X2.032000*%
+%ADD13R,0.600000X2.100000*%
 G04 #@! TD*
-G04 #@! TA.AperFunction,ComponentPad*
-%ADD18O,1.727200X2.032000*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
+%ADD14O,0.600000X2.100000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD19R,3.500000X3.300000*%
+%ADD15R,0.600000X1.550000*%
 G04 #@! TD*
-G04 #@! TA.AperFunction,BGAPad,CuDef*
-%ADD20C,9.000000*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
+%ADD16O,0.600000X1.550000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD21R,0.600000X1.550000*%
+%ADD17R,0.700000X1.200000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD22O,0.600000X1.550000*%
+%ADD18O,2.500000X0.900000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD23O,2.500000X0.900000*%
+%ADD19O,0.900000X2.500000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD24O,0.900000X2.500000*%
+%ADD20R,6.000000X6.000000*%
+G04 #@! TD*
+G04 #@! TA.AperFunction,ComponentPad*
+%ADD21O,1.727200X1.727200*%
+G04 #@! TD*
+G04 #@! TA.AperFunction,ComponentPad*
+%ADD22R,1.727200X1.727200*%
+G04 #@! TD*
+G04 #@! TA.AperFunction,ComponentPad*
+%ADD23C,5.500000*%
+G04 #@! TD*
+G04 #@! TA.AperFunction,ComponentPad*
+%ADD24R,1.727200X2.032000*%
+G04 #@! TD*
+G04 #@! TA.AperFunction,ComponentPad*
+%ADD25O,1.727200X2.032000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD25R,6.000000X6.000000*%
+%ADD26R,3.500000X3.300000*%
+G04 #@! TD*
+G04 #@! TA.AperFunction,BGAPad,CuDef*
+%ADD27C,9.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD26R,1.800000X1.400000*%
+%ADD28R,1.800000X1.400000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD27R,0.970000X1.500000*%
+%ADD29R,0.970000X1.500000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD28R,0.670000X1.000000*%
+%ADD30R,0.670000X1.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD29R,1.500000X0.970000*%
+%ADD31R,1.500000X0.970000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD30R,1.000000X0.670000*%
+%ADD32R,1.000000X0.670000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD31C,2.000000*%
+%ADD33C,2.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD32R,1.000000X1.000000*%
+%ADD34R,1.000000X1.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,BGAPad,CuDef*
-%ADD33C,0.300000*%
+%ADD35C,0.300000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD34R,1.700000X1.700000*%
+%ADD36R,1.700000X1.700000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD35O,1.700000X1.700000*%
-G04 #@! TD*
-G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD36R,1.550000X0.600000*%
-G04 #@! TD*
-G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD37O,1.550000X0.600000*%
+%ADD37O,1.700000X1.700000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
 %ADD38R,1.500000X2.700000*%
@@ -175,10 +175,98 @@ G04 #@! TA.AperFunction,Conductor*
 G04 #@! TD*
 G04 APERTURE END LIST*
 D10*
+G04 #@! TO.P,U11,1*
+G04 #@! TO.N,GND*
+X141980000Y-67706500D03*
+D11*
+G04 #@! TO.P,U11,2*
+G04 #@! TO.N,+3V3*
+X141980000Y-66436500D03*
+G04 #@! TO.P,U11,3*
+G04 #@! TO.N,FPDI_SCL*
+X141980000Y-65166500D03*
+G04 #@! TO.P,U11,4*
+G04 #@! TO.N,FPDI_SDA*
+X141980000Y-63896500D03*
+G04 #@! TO.P,U11,5*
+G04 #@! TO.N,GPDI_SDA*
+X147380000Y-63896500D03*
+G04 #@! TO.P,U11,6*
+G04 #@! TO.N,GPDI_SCL*
+X147380000Y-65166500D03*
+G04 #@! TO.P,U11,7*
+G04 #@! TO.N,/gpdi/VREF2*
+X147380000Y-66436500D03*
+G04 #@! TO.P,U11,8*
+X147380000Y-67706500D03*
+G04 #@! TD*
+D12*
+G04 #@! TO.P,U6,20*
+G04 #@! TO.N,FTDI_TXD*
+X129935000Y-104215000D03*
+G04 #@! TO.P,U6,19*
+G04 #@! TO.N,FTDI_nSLEEP*
+X129935000Y-104865000D03*
+G04 #@! TO.P,U6,18*
+G04 #@! TO.N,FTDI_TXDEN*
+X129935000Y-105515000D03*
+G04 #@! TO.P,U6,17*
+G04 #@! TO.N,FTDI_nRXLED*
+X129935000Y-106165000D03*
+G04 #@! TO.P,U6,16*
+G04 #@! TO.N,GND*
+X129935000Y-106815000D03*
+G04 #@! TO.P,U6,15*
+G04 #@! TO.N,USB5V*
+X129935000Y-107465000D03*
+G04 #@! TO.P,U6,14*
+G04 #@! TO.N,nRESET*
+X129935000Y-108115000D03*
+G04 #@! TO.P,U6,13*
+G04 #@! TO.N,FT2V5*
+X129935000Y-108765000D03*
+G04 #@! TO.P,U6,12*
+G04 #@! TO.N,USB_FTDI_D-*
+X129935000Y-109415000D03*
+G04 #@! TO.P,U6,11*
+G04 #@! TO.N,USB_FTDI_D+*
+X129935000Y-110065000D03*
+G04 #@! TO.P,U6,10*
+G04 #@! TO.N,FTDI_nTXLED*
+X135735000Y-110065000D03*
+G04 #@! TO.P,U6,9*
+G04 #@! TO.N,JTAG_TDO*
+X135735000Y-109415000D03*
+G04 #@! TO.P,U6,8*
+G04 #@! TO.N,JTAG_TMS*
+X135735000Y-108765000D03*
+G04 #@! TO.P,U6,7*
+G04 #@! TO.N,JTAG_TCK*
+X135735000Y-108115000D03*
+G04 #@! TO.P,U6,6*
+G04 #@! TO.N,GND*
+X135735000Y-107465000D03*
+G04 #@! TO.P,U6,5*
+G04 #@! TO.N,JTAG_TDI*
+X135735000Y-106815000D03*
+G04 #@! TO.P,U6,4*
+G04 #@! TO.N,FTDI_RXD*
+X135735000Y-106165000D03*
+G04 #@! TO.P,U6,3*
+G04 #@! TO.N,FT2V5*
+X135735000Y-105515000D03*
+G04 #@! TO.P,U6,2*
+G04 #@! TO.N,FTDI_nRTS*
+X135735000Y-104865000D03*
+G04 #@! TO.P,U6,1*
+G04 #@! TO.N,FTDI_nDTR*
+X135735000Y-104215000D03*
+G04 #@! TD*
+D13*
 G04 #@! TO.P,U10,1*
 G04 #@! TO.N,/flash/FLASH_nCS*
 X116340000Y-82520000D03*
-D11*
+D14*
 G04 #@! TO.P,U10,2*
 G04 #@! TO.N,/flash/FLASH_MISO*
 X117610000Y-82520000D03*
@@ -201,129 +289,50 @@ G04 #@! TO.P,U10,8*
 G04 #@! TO.N,+3V3*
 X116340000Y-89124000D03*
 G04 #@! TD*
-D12*
-G04 #@! TO.P,J1,1*
-G04 #@! TO.N,2V5_3V3*
-X97910000Y-62690000D03*
-G04 #@! TO.P,J1,2*
-X95370000Y-62690000D03*
-D13*
-G04 #@! TO.P,J1,3*
+D15*
+G04 #@! TO.P,U7,1*
+G04 #@! TO.N,/power/OSCI_32k*
+X175395000Y-96015000D03*
+D16*
+G04 #@! TO.P,U7,2*
+G04 #@! TO.N,/power/OSCO_32k*
+X174125000Y-96015000D03*
+G04 #@! TO.P,U7,3*
+G04 #@! TO.N,/power/VBAT*
+X172855000Y-96015000D03*
+G04 #@! TO.P,U7,4*
 G04 #@! TO.N,GND*
-X97910000Y-65230000D03*
-G04 #@! TO.P,J1,4*
-X95370000Y-65230000D03*
-D12*
-G04 #@! TO.P,J1,5*
-G04 #@! TO.N,GN0*
-X97910000Y-67770000D03*
-G04 #@! TO.P,J1,6*
-G04 #@! TO.N,GP0*
-X95370000Y-67770000D03*
-G04 #@! TO.P,J1,7*
-G04 #@! TO.N,GN1*
-X97910000Y-70310000D03*
-G04 #@! TO.P,J1,8*
-G04 #@! TO.N,GP1*
-X95370000Y-70310000D03*
-G04 #@! TO.P,J1,9*
-G04 #@! TO.N,GN2*
-X97910000Y-72850000D03*
-G04 #@! TO.P,J1,10*
-G04 #@! TO.N,GP2*
-X95370000Y-72850000D03*
-G04 #@! TO.P,J1,11*
-G04 #@! TO.N,GN3*
-X97910000Y-75390000D03*
-G04 #@! TO.P,J1,12*
-G04 #@! TO.N,GP3*
-X95370000Y-75390000D03*
-G04 #@! TO.P,J1,13*
-G04 #@! TO.N,GN4*
-X97910000Y-77930000D03*
-G04 #@! TO.P,J1,14*
-G04 #@! TO.N,GP4*
-X95370000Y-77930000D03*
-G04 #@! TO.P,J1,15*
-G04 #@! TO.N,GN5*
-X97910000Y-80470000D03*
-G04 #@! TO.P,J1,16*
-G04 #@! TO.N,GP5*
-X95370000Y-80470000D03*
-G04 #@! TO.P,J1,17*
-G04 #@! TO.N,GN6*
-X97910000Y-83010000D03*
-G04 #@! TO.P,J1,18*
-G04 #@! TO.N,GP6*
-X95370000Y-83010000D03*
-G04 #@! TO.P,J1,19*
-G04 #@! TO.N,2V5_3V3*
-X97910000Y-85550000D03*
-G04 #@! TO.P,J1,20*
-X95370000Y-85550000D03*
-D13*
-G04 #@! TO.P,J1,21*
+X171585000Y-96015000D03*
+G04 #@! TO.P,U7,5*
+G04 #@! TO.N,FPDI_SDA*
+X171585000Y-90615000D03*
+G04 #@! TO.P,U7,6*
+G04 #@! TO.N,FPDI_SCL*
+X172855000Y-90615000D03*
+G04 #@! TO.P,U7,7*
+G04 #@! TO.N,/power/WAKEUPn*
+X174125000Y-90615000D03*
+G04 #@! TO.P,U7,8*
+G04 #@! TO.N,/power/RTCVDD*
+X175395000Y-90615000D03*
+G04 #@! TD*
+D17*
+G04 #@! TO.P,U5,1*
+G04 #@! TO.N,/power/PWREN*
+X157285000Y-77392000D03*
+G04 #@! TO.P,U5,2*
 G04 #@! TO.N,GND*
-X97910000Y-88090000D03*
-G04 #@! TO.P,J1,22*
-X95370000Y-88090000D03*
-D12*
-G04 #@! TO.P,J1,23*
-G04 #@! TO.N,GN7*
-X97910000Y-90630000D03*
-G04 #@! TO.P,J1,24*
-G04 #@! TO.N,GP7*
-X95370000Y-90630000D03*
-G04 #@! TO.P,J1,25*
-G04 #@! TO.N,GN8*
-X97910000Y-93170000D03*
-G04 #@! TO.P,J1,26*
-G04 #@! TO.N,GP8*
-X95370000Y-93170000D03*
-G04 #@! TO.P,J1,27*
-G04 #@! TO.N,GN9*
-X97910000Y-95710000D03*
-G04 #@! TO.P,J1,28*
-G04 #@! TO.N,GP9*
-X95370000Y-95710000D03*
-G04 #@! TO.P,J1,29*
-G04 #@! TO.N,GN10*
-X97910000Y-98250000D03*
-G04 #@! TO.P,J1,30*
-G04 #@! TO.N,GP10*
-X95370000Y-98250000D03*
-G04 #@! TO.P,J1,31*
-G04 #@! TO.N,GN11*
-X97910000Y-100790000D03*
-G04 #@! TO.P,J1,32*
-G04 #@! TO.N,GP11*
-X95370000Y-100790000D03*
-G04 #@! TO.P,J1,33*
-G04 #@! TO.N,GN12*
-X97910000Y-103330000D03*
-G04 #@! TO.P,J1,34*
-G04 #@! TO.N,GP12*
-X95370000Y-103330000D03*
-G04 #@! TO.P,J1,35*
-G04 #@! TO.N,GN13*
-X97910000Y-105870000D03*
-G04 #@! TO.P,J1,36*
-G04 #@! TO.N,GP13*
-X95370000Y-105870000D03*
-D13*
-G04 #@! TO.P,J1,37*
-G04 #@! TO.N,GND*
-X97910000Y-108410000D03*
-G04 #@! TO.P,J1,38*
-X95370000Y-108410000D03*
-D12*
-G04 #@! TO.P,J1,39*
-G04 #@! TO.N,2V5_3V3*
-X97910000Y-110950000D03*
-G04 #@! TO.P,J1,40*
-X95370000Y-110950000D03*
+X158235000Y-77392000D03*
+G04 #@! TO.P,U5,3*
+G04 #@! TO.N,/power/L3*
+X159185000Y-77392000D03*
+G04 #@! TO.P,U5,4*
+G04 #@! TO.N,+5V*
+X159185000Y-79992000D03*
+G04 #@! TO.P,U5,5*
+G04 #@! TO.N,/power/FB3*
+X157285000Y-79992000D03*
 G04 #@! TD*
-D14*
 G04 #@! TO.P,U3,1*
 G04 #@! TO.N,/power/PWREN*
 X159825000Y-90600000D03*
@@ -356,35 +365,261 @@ G04 #@! TO.P,U4,5*
 G04 #@! TO.N,/power/FB2*
 X104575000Y-83615000D03*
 G04 #@! TD*
-G04 #@! TO.P,U5,1*
-G04 #@! TO.N,/power/PWREN*
-X157285000Y-77392000D03*
-G04 #@! TO.P,U5,2*
+D18*
+G04 #@! TO.P,U9,38*
 G04 #@! TO.N,GND*
-X158235000Y-77392000D03*
-G04 #@! TO.P,U5,3*
-G04 #@! TO.N,/power/L3*
-X159185000Y-77392000D03*
-G04 #@! TO.P,U5,4*
-G04 #@! TO.N,+5V*
-X159185000Y-79992000D03*
-G04 #@! TO.P,U5,5*
-G04 #@! TO.N,/power/FB3*
-X157285000Y-79992000D03*
+X126230000Y-111000000D03*
+G04 #@! TO.P,U9,37*
+G04 #@! TO.N,JTAG_TDI*
+X126230000Y-109730000D03*
+G04 #@! TO.P,U9,36*
+G04 #@! TO.N,PROG_DONE*
+X126230000Y-108460000D03*
+G04 #@! TO.P,U9,35*
+G04 #@! TO.N,WIFI_TXD*
+X126230000Y-107190000D03*
+G04 #@! TO.P,U9,34*
+G04 #@! TO.N,WIFI_RXD*
+X126230000Y-105920000D03*
+G04 #@! TO.P,U9,33*
+G04 #@! TO.N,JTAG_TMS*
+X126230000Y-104650000D03*
+G04 #@! TO.P,U9,32*
+G04 #@! TO.N,Net-(U9-Pad32)*
+X126230000Y-103380000D03*
+G04 #@! TO.P,U9,31*
+G04 #@! TO.N,JTAG_TDO*
+X126230000Y-102110000D03*
+G04 #@! TO.P,U9,30*
+G04 #@! TO.N,JTAG_TCK*
+X126230000Y-100840000D03*
+G04 #@! TO.P,U9,29*
+G04 #@! TO.N,WIFI_GPIO5*
+X126230000Y-99570000D03*
+G04 #@! TO.P,U9,28*
+G04 #@! TO.N,WIFI_GPIO17*
+X126230000Y-98300000D03*
+G04 #@! TO.P,U9,27*
+G04 #@! TO.N,WIFI_GPIO16*
+X126230000Y-97030000D03*
+G04 #@! TO.P,U9,26*
+G04 #@! TO.N,SD_D1*
+X126230000Y-95760000D03*
+G04 #@! TO.P,U9,25*
+G04 #@! TO.N,WIFI_GPIO0*
+X126230000Y-94490000D03*
+D19*
+G04 #@! TO.P,U9,24*
+G04 #@! TO.N,SD_D0*
+X122945000Y-93000000D03*
+G04 #@! TO.P,U9,23*
+G04 #@! TO.N,SD_CMD*
+X121675000Y-93000000D03*
+G04 #@! TO.P,U9,22*
+G04 #@! TO.N,Net-(U9-Pad22)*
+X120405000Y-93000000D03*
+G04 #@! TO.P,U9,21*
+G04 #@! TO.N,Net-(U9-Pad21)*
+X119135000Y-93000000D03*
+G04 #@! TO.P,U9,20*
+G04 #@! TO.N,Net-(U9-Pad20)*
+X117865000Y-93000000D03*
+G04 #@! TO.P,U9,19*
+G04 #@! TO.N,Net-(U9-Pad19)*
+X116595000Y-93000000D03*
+G04 #@! TO.P,U9,18*
+G04 #@! TO.N,Net-(U9-Pad18)*
+X115325000Y-93000000D03*
+G04 #@! TO.P,U9,17*
+G04 #@! TO.N,Net-(U9-Pad17)*
+X114055000Y-93000000D03*
+G04 #@! TO.P,U9,16*
+G04 #@! TO.N,SD_D3*
+X112785000Y-93000000D03*
+G04 #@! TO.P,U9,15*
+G04 #@! TO.N,GND*
+X111515000Y-93000000D03*
+D18*
+G04 #@! TO.P,U9,14*
+G04 #@! TO.N,SD_D2*
+X108230000Y-94490000D03*
+G04 #@! TO.P,U9,13*
+G04 #@! TO.N,SD_CLK*
+X108230000Y-95760000D03*
+G04 #@! TO.P,U9,12*
+G04 #@! TO.N,Net-(U9-Pad12)*
+X108230000Y-97030000D03*
+G04 #@! TO.P,U9,11*
+G04 #@! TO.N,GN11*
+X108230000Y-98300000D03*
+G04 #@! TO.P,U9,10*
+G04 #@! TO.N,GP11*
+X108230000Y-99570000D03*
+G04 #@! TO.P,U9,9*
+G04 #@! TO.N,GN12*
+X108230000Y-100840000D03*
+G04 #@! TO.P,U9,8*
+G04 #@! TO.N,GP12*
+X108230000Y-102110000D03*
+G04 #@! TO.P,U9,7*
+G04 #@! TO.N,GN13*
+X108230000Y-103380000D03*
+G04 #@! TO.P,U9,6*
+G04 #@! TO.N,GP13*
+X108230000Y-104650000D03*
+G04 #@! TO.P,U9,5*
+G04 #@! TO.N,Net-(U9-Pad5)*
+X108230000Y-105920000D03*
+G04 #@! TO.P,U9,4*
+G04 #@! TO.N,Net-(U9-Pad4)*
+X108230000Y-107190000D03*
+G04 #@! TO.P,U9,3*
+G04 #@! TO.N,/wifi/WIFIEN*
+X108230000Y-108460000D03*
+G04 #@! TO.P,U9,2*
+G04 #@! TO.N,+3V3*
+X108230000Y-109730000D03*
+G04 #@! TO.P,U9,1*
+G04 #@! TO.N,GND*
+X108230000Y-111000000D03*
+D20*
+G04 #@! TO.P,U9,39*
+X116930000Y-103300000D03*
+G04 #@! TD*
+D21*
+G04 #@! TO.P,J1,1*
+G04 #@! TO.N,2V5_3V3*
+X97910000Y-62690000D03*
+G04 #@! TO.P,J1,2*
+X95370000Y-62690000D03*
+D22*
+G04 #@! TO.P,J1,3*
+G04 #@! TO.N,GND*
+X97910000Y-65230000D03*
+G04 #@! TO.P,J1,4*
+X95370000Y-65230000D03*
+D21*
+G04 #@! TO.P,J1,5*
+G04 #@! TO.N,GN0*
+X97910000Y-67770000D03*
+G04 #@! TO.P,J1,6*
+G04 #@! TO.N,GP0*
+X95370000Y-67770000D03*
+G04 #@! TO.P,J1,7*
+G04 #@! TO.N,GN1*
+X97910000Y-70310000D03*
+G04 #@! TO.P,J1,8*
+G04 #@! TO.N,GP1*
+X95370000Y-70310000D03*
+G04 #@! TO.P,J1,9*
+G04 #@! TO.N,GN2*
+X97910000Y-72850000D03*
+G04 #@! TO.P,J1,10*
+G04 #@! TO.N,GP2*
+X95370000Y-72850000D03*
+G04 #@! TO.P,J1,11*
+G04 #@! TO.N,GN3*
+X97910000Y-75390000D03*
+G04 #@! TO.P,J1,12*
+G04 #@! TO.N,GP3*
+X95370000Y-75390000D03*
+G04 #@! TO.P,J1,13*
+G04 #@! TO.N,GN4*
+X97910000Y-77930000D03*
+G04 #@! TO.P,J1,14*
+G04 #@! TO.N,GP4*
+X95370000Y-77930000D03*
+G04 #@! TO.P,J1,15*
+G04 #@! TO.N,GN5*
+X97910000Y-80470000D03*
+G04 #@! TO.P,J1,16*
+G04 #@! TO.N,GP5*
+X95370000Y-80470000D03*
+G04 #@! TO.P,J1,17*
+G04 #@! TO.N,GN6*
+X97910000Y-83010000D03*
+G04 #@! TO.P,J1,18*
+G04 #@! TO.N,GP6*
+X95370000Y-83010000D03*
+G04 #@! TO.P,J1,19*
+G04 #@! TO.N,2V5_3V3*
+X97910000Y-85550000D03*
+G04 #@! TO.P,J1,20*
+X95370000Y-85550000D03*
+D22*
+G04 #@! TO.P,J1,21*
+G04 #@! TO.N,GND*
+X97910000Y-88090000D03*
+G04 #@! TO.P,J1,22*
+X95370000Y-88090000D03*
+D21*
+G04 #@! TO.P,J1,23*
+G04 #@! TO.N,GN7*
+X97910000Y-90630000D03*
+G04 #@! TO.P,J1,24*
+G04 #@! TO.N,GP7*
+X95370000Y-90630000D03*
+G04 #@! TO.P,J1,25*
+G04 #@! TO.N,GN8*
+X97910000Y-93170000D03*
+G04 #@! TO.P,J1,26*
+G04 #@! TO.N,GP8*
+X95370000Y-93170000D03*
+G04 #@! TO.P,J1,27*
+G04 #@! TO.N,GN9*
+X97910000Y-95710000D03*
+G04 #@! TO.P,J1,28*
+G04 #@! TO.N,GP9*
+X95370000Y-95710000D03*
+G04 #@! TO.P,J1,29*
+G04 #@! TO.N,GN10*
+X97910000Y-98250000D03*
+G04 #@! TO.P,J1,30*
+G04 #@! TO.N,GP10*
+X95370000Y-98250000D03*
+G04 #@! TO.P,J1,31*
+G04 #@! TO.N,GN11*
+X97910000Y-100790000D03*
+G04 #@! TO.P,J1,32*
+G04 #@! TO.N,GP11*
+X95370000Y-100790000D03*
+G04 #@! TO.P,J1,33*
+G04 #@! TO.N,GN12*
+X97910000Y-103330000D03*
+G04 #@! TO.P,J1,34*
+G04 #@! TO.N,GP12*
+X95370000Y-103330000D03*
+G04 #@! TO.P,J1,35*
+G04 #@! TO.N,GN13*
+X97910000Y-105870000D03*
+G04 #@! TO.P,J1,36*
+G04 #@! TO.N,GP13*
+X95370000Y-105870000D03*
+D22*
+G04 #@! TO.P,J1,37*
+G04 #@! TO.N,GND*
+X97910000Y-108410000D03*
+G04 #@! TO.P,J1,38*
+X95370000Y-108410000D03*
+D21*
+G04 #@! TO.P,J1,39*
+G04 #@! TO.N,2V5_3V3*
+X97910000Y-110950000D03*
+G04 #@! TO.P,J1,40*
+X95370000Y-110950000D03*
 G04 #@! TD*
-D12*
 G04 #@! TO.P,J2,1*
 G04 #@! TO.N,+3V3*
 X184270000Y-110950000D03*
 G04 #@! TO.P,J2,2*
 X186810000Y-110950000D03*
-D13*
+D22*
 G04 #@! TO.P,J2,3*
 G04 #@! TO.N,GND*
 X184270000Y-108410000D03*
 G04 #@! TO.P,J2,4*
 X186810000Y-108410000D03*
-D12*
+D21*
 G04 #@! TO.P,J2,5*
 G04 #@! TO.N,GN14*
 X184270000Y-105870000D03*
@@ -432,13 +667,13 @@ G04 #@! TO.N,+3V3*
 X184270000Y-88090000D03*
 G04 #@! TO.P,J2,20*
 X186810000Y-88090000D03*
-D13*
+D22*
 G04 #@! TO.P,J2,21*
 G04 #@! TO.N,GND*
 X184270000Y-85550000D03*
 G04 #@! TO.P,J2,22*
 X186810000Y-85550000D03*
-D12*
+D21*
 G04 #@! TO.P,J2,23*
 G04 #@! TO.N,GN21*
 X184270000Y-83010000D03*
@@ -481,303 +716,93 @@ X184270000Y-67770000D03*
 G04 #@! TO.P,J2,36*
 G04 #@! TO.N,GP27*
 X186810000Y-67770000D03*
-D13*
+D22*
 G04 #@! TO.P,J2,37*
 G04 #@! TO.N,GND*
 X184270000Y-65230000D03*
 G04 #@! TO.P,J2,38*
-X186810000Y-65230000D03*
-D12*
-G04 #@! TO.P,J2,39*
-G04 #@! TO.N,/gpio/IN5V*
-X184270000Y-62690000D03*
-G04 #@! TO.P,J2,40*
-G04 #@! TO.N,/gpio/OUT5V*
-X186810000Y-62690000D03*
-G04 #@! TD*
-D15*
-G04 #@! TO.P,H1,1*
-G04 #@! TO.N,GND*
-X102990000Y-108410000D03*
-G04 #@! TD*
-G04 #@! TO.P,H2,1*
-G04 #@! TO.N,GND*
-X179190000Y-108410000D03*
-G04 #@! TD*
-G04 #@! TO.P,H3,1*
-G04 #@! TO.N,GND*
-X179190000Y-65230000D03*
-G04 #@! TD*
-G04 #@! TO.P,H4,1*
-G04 #@! TO.N,GND*
-X102990000Y-65230000D03*
-G04 #@! TD*
-D16*
-G04 #@! TO.P,U6,1*
-G04 #@! TO.N,FTDI_nDTR*
-X135735000Y-104215000D03*
-G04 #@! TO.P,U6,2*
-G04 #@! TO.N,FTDI_nRTS*
-X135735000Y-104865000D03*
-G04 #@! TO.P,U6,3*
-G04 #@! TO.N,FT2V5*
-X135735000Y-105515000D03*
-G04 #@! TO.P,U6,4*
-G04 #@! TO.N,FTDI_RXD*
-X135735000Y-106165000D03*
-G04 #@! TO.P,U6,5*
-G04 #@! TO.N,JTAG_TDI*
-X135735000Y-106815000D03*
-G04 #@! TO.P,U6,6*
-G04 #@! TO.N,GND*
-X135735000Y-107465000D03*
-G04 #@! TO.P,U6,7*
-G04 #@! TO.N,JTAG_TCK*
-X135735000Y-108115000D03*
-G04 #@! TO.P,U6,8*
-G04 #@! TO.N,JTAG_TMS*
-X135735000Y-108765000D03*
-G04 #@! TO.P,U6,9*
-G04 #@! TO.N,JTAG_TDO*
-X135735000Y-109415000D03*
-G04 #@! TO.P,U6,10*
-G04 #@! TO.N,FTDI_nTXLED*
-X135735000Y-110065000D03*
-G04 #@! TO.P,U6,11*
-G04 #@! TO.N,USB_FTDI_D+*
-X129935000Y-110065000D03*
-G04 #@! TO.P,U6,12*
-G04 #@! TO.N,USB_FTDI_D-*
-X129935000Y-109415000D03*
-G04 #@! TO.P,U6,13*
-G04 #@! TO.N,FT2V5*
-X129935000Y-108765000D03*
-G04 #@! TO.P,U6,14*
-G04 #@! TO.N,nRESET*
-X129935000Y-108115000D03*
-G04 #@! TO.P,U6,15*
-G04 #@! TO.N,USB5V*
-X129935000Y-107465000D03*
-G04 #@! TO.P,U6,16*
-G04 #@! TO.N,GND*
-X129935000Y-106815000D03*
-G04 #@! TO.P,U6,17*
-G04 #@! TO.N,FTDI_nRXLED*
-X129935000Y-106165000D03*
-G04 #@! TO.P,U6,18*
-G04 #@! TO.N,FTDI_TXDEN*
-X129935000Y-105515000D03*
-G04 #@! TO.P,U6,19*
-G04 #@! TO.N,FTDI_nSLEEP*
-X129935000Y-104865000D03*
-G04 #@! TO.P,U6,20*
-G04 #@! TO.N,FTDI_TXD*
-X129935000Y-104215000D03*
-G04 #@! TD*
-D13*
-G04 #@! TO.P,J4,1*
-G04 #@! TO.N,GND*
-X140455000Y-104600000D03*
-D12*
-G04 #@! TO.P,J4,2*
-G04 #@! TO.N,+3V3*
-X137915000Y-104600000D03*
-G04 #@! TO.P,J4,3*
-G04 #@! TO.N,JTAG_TDI*
-X140455000Y-107140000D03*
-G04 #@! TO.P,J4,4*
-G04 #@! TO.N,JTAG_TCK*
-X137915000Y-107140000D03*
-G04 #@! TO.P,J4,5*
-G04 #@! TO.N,JTAG_TMS*
-X140455000Y-109680000D03*
-G04 #@! TO.P,J4,6*
-G04 #@! TO.N,JTAG_TDO*
-X137915000Y-109680000D03*
-G04 #@! TD*
-D17*
-G04 #@! TO.P,OLED1,1*
-G04 #@! TO.N,GND*
-X147440000Y-100790000D03*
-D18*
-G04 #@! TO.P,OLED1,2*
-G04 #@! TO.N,+3V3*
-X144900000Y-100790000D03*
-G04 #@! TO.P,OLED1,3*
-G04 #@! TO.N,OLED_CLK*
-X142360000Y-100790000D03*
-G04 #@! TO.P,OLED1,4*
-G04 #@! TO.N,OLED_MOSI*
-X139820000Y-100790000D03*
-G04 #@! TO.P,OLED1,5*
-G04 #@! TO.N,OLED_RES*
-X137280000Y-100790000D03*
-G04 #@! TO.P,OLED1,6*
-G04 #@! TO.N,OLED_DC*
-X134740000Y-100790000D03*
-G04 #@! TO.P,OLED1,7*
-G04 #@! TO.N,OLED_CS*
-X132200000Y-100790000D03*
-G04 #@! TD*
-D19*
-G04 #@! TO.P,BAT1,1*
-G04 #@! TO.N,/power/VBAT*
-X172485000Y-105870000D03*
-X156685000Y-105870000D03*
-D20*
-G04 #@! TO.P,BAT1,2*
-G04 #@! TO.N,GND*
-X164585000Y-105870000D03*
-G04 #@! TD*
-D21*
-G04 #@! TO.P,U7,1*
-G04 #@! TO.N,/power/OSCI_32k*
-X175395000Y-96015000D03*
-D22*
-G04 #@! TO.P,U7,2*
-G04 #@! TO.N,/power/OSCO_32k*
-X174125000Y-96015000D03*
-G04 #@! TO.P,U7,3*
-G04 #@! TO.N,/power/VBAT*
-X172855000Y-96015000D03*
-G04 #@! TO.P,U7,4*
-G04 #@! TO.N,GND*
-X171585000Y-96015000D03*
-G04 #@! TO.P,U7,5*
-G04 #@! TO.N,FPDI_SDA*
-X171585000Y-90615000D03*
-G04 #@! TO.P,U7,6*
-G04 #@! TO.N,FPDI_SCL*
-X172855000Y-90615000D03*
-G04 #@! TO.P,U7,7*
-G04 #@! TO.N,/power/WAKEUPn*
-X174125000Y-90615000D03*
-G04 #@! TO.P,U7,8*
-G04 #@! TO.N,/power/RTCVDD*
-X175395000Y-90615000D03*
-G04 #@! TD*
-D23*
-G04 #@! TO.P,U9,38*
-G04 #@! TO.N,GND*
-X126230000Y-111000000D03*
-G04 #@! TO.P,U9,37*
-G04 #@! TO.N,JTAG_TDI*
-X126230000Y-109730000D03*
-G04 #@! TO.P,U9,36*
-G04 #@! TO.N,PROG_DONE*
-X126230000Y-108460000D03*
-G04 #@! TO.P,U9,35*
-G04 #@! TO.N,WIFI_TXD*
-X126230000Y-107190000D03*
-G04 #@! TO.P,U9,34*
-G04 #@! TO.N,WIFI_RXD*
-X126230000Y-105920000D03*
-G04 #@! TO.P,U9,33*
-G04 #@! TO.N,JTAG_TMS*
-X126230000Y-104650000D03*
-G04 #@! TO.P,U9,32*
-G04 #@! TO.N,Net-(U9-Pad32)*
-X126230000Y-103380000D03*
-G04 #@! TO.P,U9,31*
-G04 #@! TO.N,JTAG_TDO*
-X126230000Y-102110000D03*
-G04 #@! TO.P,U9,30*
-G04 #@! TO.N,JTAG_TCK*
-X126230000Y-100840000D03*
-G04 #@! TO.P,U9,29*
-G04 #@! TO.N,WIFI_GPIO5*
-X126230000Y-99570000D03*
-G04 #@! TO.P,U9,28*
-G04 #@! TO.N,WIFI_GPIO17*
-X126230000Y-98300000D03*
-G04 #@! TO.P,U9,27*
-G04 #@! TO.N,WIFI_GPIO16*
-X126230000Y-97030000D03*
-G04 #@! TO.P,U9,26*
-G04 #@! TO.N,SD_D1*
-X126230000Y-95760000D03*
-G04 #@! TO.P,U9,25*
-G04 #@! TO.N,WIFI_GPIO0*
-X126230000Y-94490000D03*
-D24*
-G04 #@! TO.P,U9,24*
-G04 #@! TO.N,SD_D0*
-X122945000Y-93000000D03*
-G04 #@! TO.P,U9,23*
-G04 #@! TO.N,SD_CMD*
-X121675000Y-93000000D03*
-G04 #@! TO.P,U9,22*
-G04 #@! TO.N,Net-(U9-Pad22)*
-X120405000Y-93000000D03*
-G04 #@! TO.P,U9,21*
-G04 #@! TO.N,Net-(U9-Pad21)*
-X119135000Y-93000000D03*
-G04 #@! TO.P,U9,20*
-G04 #@! TO.N,Net-(U9-Pad20)*
-X117865000Y-93000000D03*
-G04 #@! TO.P,U9,19*
-G04 #@! TO.N,Net-(U9-Pad19)*
-X116595000Y-93000000D03*
-G04 #@! TO.P,U9,18*
-G04 #@! TO.N,Net-(U9-Pad18)*
-X115325000Y-93000000D03*
-G04 #@! TO.P,U9,17*
-G04 #@! TO.N,Net-(U9-Pad17)*
-X114055000Y-93000000D03*
-G04 #@! TO.P,U9,16*
-G04 #@! TO.N,SD_D3*
-X112785000Y-93000000D03*
-G04 #@! TO.P,U9,15*
-G04 #@! TO.N,GND*
-X111515000Y-93000000D03*
+X186810000Y-65230000D03*
+D21*
+G04 #@! TO.P,J2,39*
+G04 #@! TO.N,/gpio/IN5V*
+X184270000Y-62690000D03*
+G04 #@! TO.P,J2,40*
+G04 #@! TO.N,/gpio/OUT5V*
+X186810000Y-62690000D03*
+G04 #@! TD*
 D23*
-G04 #@! TO.P,U9,14*
-G04 #@! TO.N,SD_D2*
-X108230000Y-94490000D03*
-G04 #@! TO.P,U9,13*
-G04 #@! TO.N,SD_CLK*
-X108230000Y-95760000D03*
-G04 #@! TO.P,U9,12*
-G04 #@! TO.N,Net-(U9-Pad12)*
-X108230000Y-97030000D03*
-G04 #@! TO.P,U9,11*
-G04 #@! TO.N,GN11*
-X108230000Y-98300000D03*
-G04 #@! TO.P,U9,10*
-G04 #@! TO.N,GP11*
-X108230000Y-99570000D03*
-G04 #@! TO.P,U9,9*
-G04 #@! TO.N,GN12*
-X108230000Y-100840000D03*
-G04 #@! TO.P,U9,8*
-G04 #@! TO.N,GP12*
-X108230000Y-102110000D03*
-G04 #@! TO.P,U9,7*
-G04 #@! TO.N,GN13*
-X108230000Y-103380000D03*
-G04 #@! TO.P,U9,6*
-G04 #@! TO.N,GP13*
-X108230000Y-104650000D03*
-G04 #@! TO.P,U9,5*
-G04 #@! TO.N,Net-(U9-Pad5)*
-X108230000Y-105920000D03*
-G04 #@! TO.P,U9,4*
-G04 #@! TO.N,Net-(U9-Pad4)*
-X108230000Y-107190000D03*
-G04 #@! TO.P,U9,3*
-G04 #@! TO.N,/wifi/WIFIEN*
-X108230000Y-108460000D03*
-G04 #@! TO.P,U9,2*
+G04 #@! TO.P,H1,1*
+G04 #@! TO.N,GND*
+X102990000Y-108410000D03*
+G04 #@! TD*
+G04 #@! TO.P,H2,1*
+G04 #@! TO.N,GND*
+X179190000Y-108410000D03*
+G04 #@! TD*
+G04 #@! TO.P,H3,1*
+G04 #@! TO.N,GND*
+X179190000Y-65230000D03*
+G04 #@! TD*
+G04 #@! TO.P,H4,1*
+G04 #@! TO.N,GND*
+X102990000Y-65230000D03*
+G04 #@! TD*
+D22*
+G04 #@! TO.P,J4,1*
+G04 #@! TO.N,GND*
+X140455000Y-104600000D03*
+D21*
+G04 #@! TO.P,J4,2*
 G04 #@! TO.N,+3V3*
-X108230000Y-109730000D03*
-G04 #@! TO.P,U9,1*
+X137915000Y-104600000D03*
+G04 #@! TO.P,J4,3*
+G04 #@! TO.N,JTAG_TDI*
+X140455000Y-107140000D03*
+G04 #@! TO.P,J4,4*
+G04 #@! TO.N,JTAG_TCK*
+X137915000Y-107140000D03*
+G04 #@! TO.P,J4,5*
+G04 #@! TO.N,JTAG_TMS*
+X140455000Y-109680000D03*
+G04 #@! TO.P,J4,6*
+G04 #@! TO.N,JTAG_TDO*
+X137915000Y-109680000D03*
+G04 #@! TD*
+D24*
+G04 #@! TO.P,OLED1,1*
 G04 #@! TO.N,GND*
-X108230000Y-111000000D03*
+X147440000Y-100790000D03*
 D25*
-G04 #@! TO.P,U9,39*
-X116930000Y-103300000D03*
+G04 #@! TO.P,OLED1,2*
+G04 #@! TO.N,+3V3*
+X144900000Y-100790000D03*
+G04 #@! TO.P,OLED1,3*
+G04 #@! TO.N,OLED_CLK*
+X142360000Y-100790000D03*
+G04 #@! TO.P,OLED1,4*
+G04 #@! TO.N,OLED_MOSI*
+X139820000Y-100790000D03*
+G04 #@! TO.P,OLED1,5*
+G04 #@! TO.N,OLED_RES*
+X137280000Y-100790000D03*
+G04 #@! TO.P,OLED1,6*
+G04 #@! TO.N,OLED_DC*
+X134740000Y-100790000D03*
+G04 #@! TO.P,OLED1,7*
+G04 #@! TO.N,OLED_CS*
+X132200000Y-100790000D03*
 G04 #@! TD*
 D26*
+G04 #@! TO.P,BAT1,1*
+G04 #@! TO.N,/power/VBAT*
+X172485000Y-105870000D03*
+X156685000Y-105870000D03*
+D27*
+G04 #@! TO.P,BAT1,2*
+G04 #@! TO.N,GND*
+X164585000Y-105870000D03*
+G04 #@! TD*
+D28*
 G04 #@! TO.P,Y2,4*
 G04 #@! TO.N,/power/OSCO_32k*
 X178576000Y-98522000D03*
@@ -791,7 +816,7 @@ G04 #@! TO.P,Y2,1*
 G04 #@! TO.N,/power/OSCI_32k*
 X178576000Y-101322000D03*
 G04 #@! TD*
-D27*
+D29*
 G04 #@! TO.P,C47,1*
 G04 #@! TO.N,2V5_3V3*
 X133546000Y-68550000D03*
@@ -806,7 +831,7 @@ G04 #@! TO.P,C1,2*
 G04 #@! TO.N,GND*
 X104658500Y-81885000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,C2,1*
 G04 #@! TO.N,/power/P1V1*
 X153985000Y-96910000D03*
@@ -814,7 +839,7 @@ G04 #@! TO.P,C2,2*
 G04 #@! TO.N,/power/FB1*
 X155735000Y-96910000D03*
 G04 #@! TD*
-D27*
+D29*
 G04 #@! TO.P,C3,2*
 G04 #@! TO.N,GND*
 X156015000Y-90630000D03*
@@ -829,7 +854,7 @@ G04 #@! TO.P,C4,2*
 G04 #@! TO.N,GND*
 X156015000Y-92535000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.P,C5,2*
 G04 #@! TO.N,GND*
 X163315000Y-90945000D03*
@@ -837,7 +862,7 @@ G04 #@! TO.P,C5,1*
 G04 #@! TO.N,+5V*
 X163315000Y-92855000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,C6,1*
 G04 #@! TO.N,/power/P3V3*
 X151645000Y-82375000D03*
@@ -845,7 +870,7 @@ G04 #@! TO.P,C6,2*
 G04 #@! TO.N,/power/FB3*
 X153395000Y-82375000D03*
 G04 #@! TD*
-D27*
+D29*
 G04 #@! TO.P,C7,2*
 G04 #@! TO.N,GND*
 X153475000Y-79200000D03*
@@ -860,7 +885,7 @@ G04 #@! TO.P,C8,1*
 G04 #@! TO.N,/power/P3V3*
 X151565000Y-77295000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.P,C9,1*
 G04 #@! TO.N,+5V*
 X160775000Y-79520000D03*
@@ -868,7 +893,7 @@ G04 #@! TO.P,C9,2*
 G04 #@! TO.N,GND*
 X160775000Y-77610000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,C10,2*
 G04 #@! TO.N,/power/FB2*
 X108465000Y-81105000D03*
@@ -876,7 +901,7 @@ G04 #@! TO.P,C10,1*
 G04 #@! TO.N,/power/P2V5*
 X110215000Y-81105000D03*
 G04 #@! TD*
-D27*
+D29*
 G04 #@! TO.P,C11,2*
 G04 #@! TO.N,GND*
 X108385000Y-84280000D03*
@@ -891,7 +916,7 @@ G04 #@! TO.P,C12,2*
 G04 #@! TO.N,GND*
 X108385000Y-86185000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.P,C13,2*
 G04 #@! TO.N,/power/WKUP*
 X173221000Y-83833000D03*
@@ -899,7 +924,7 @@ G04 #@! TO.P,C13,1*
 G04 #@! TO.N,+5V*
 X173221000Y-85743000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,C14,2*
 G04 #@! TO.N,GND*
 X175380000Y-76900000D03*
@@ -907,7 +932,7 @@ G04 #@! TO.P,C14,1*
 G04 #@! TO.N,/power/SHUT*
 X175380000Y-75150000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.P,C15,1*
 G04 #@! TO.N,/sdcard/SD3V3*
 X105276000Y-99967000D03*
@@ -929,7 +954,7 @@ G04 #@! TO.P,C17,2*
 G04 #@! TO.N,GND*
 X138500000Y-92575000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,C18,1*
 G04 #@! TO.N,/gpdi/VREF2*
 X150589600Y-64359000D03*
@@ -937,7 +962,7 @@ G04 #@! TO.P,C18,2*
 G04 #@! TO.N,GND*
 X150589600Y-62609000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.P,C19,1*
 G04 #@! TO.N,+2V5*
 X138500000Y-82375000D03*
@@ -952,7 +977,7 @@ G04 #@! TO.P,C20,1*
 G04 #@! TO.N,+3V3*
 X138500000Y-85665000D03*
 G04 #@! TD*
-D27*
+D29*
 G04 #@! TO.P,C21,2*
 G04 #@! TO.N,GND*
 X103706000Y-93061000D03*
@@ -981,7 +1006,7 @@ G04 #@! TO.P,C24,2*
 G04 #@! TO.N,GND*
 X149279000Y-74882000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,C25,2*
 G04 #@! TO.N,GND*
 X140900000Y-87095000D03*
@@ -1024,7 +1049,7 @@ G04 #@! TO.P,C30,2*
 G04 #@! TO.N,GND*
 X134900000Y-91895000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,C31,1*
 G04 #@! TO.N,+3V3*
 X135225000Y-88420000D03*
@@ -1053,7 +1078,7 @@ G04 #@! TO.P,C34,2*
 G04 #@! TO.N,GND*
 X156625000Y-82220000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,C35,1*
 G04 #@! TO.N,+3V3*
 X177300000Y-94025000D03*
@@ -1061,7 +1086,7 @@ G04 #@! TO.P,C35,2*
 G04 #@! TO.N,GND*
 X177300000Y-95775000D03*
 G04 #@! TD*
-D27*
+D29*
 G04 #@! TO.P,C46,1*
 G04 #@! TO.N,+3V3*
 X145342000Y-103584000D03*
@@ -1069,7 +1094,7 @@ G04 #@! TO.P,C46,2*
 G04 #@! TO.N,GND*
 X147252000Y-103584000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,C48,2*
 G04 #@! TO.N,GND*
 X103995000Y-70963000D03*
@@ -1084,7 +1109,7 @@ G04 #@! TO.P,C49,1*
 G04 #@! TO.N,2V5_3V3*
 X101622000Y-91156000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,C50,1*
 G04 #@! TO.N,+3V3*
 X179713000Y-88856000D03*
@@ -1092,7 +1117,7 @@ G04 #@! TO.P,C50,2*
 G04 #@! TO.N,GND*
 X179713000Y-87106000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,C51,1*
 G04 #@! TO.N,+3V3*
 X180473000Y-103856000D03*
@@ -1114,7 +1139,7 @@ G04 #@! TO.P,C53,1*
 G04 #@! TO.N,2V5_3V3*
 X134577200Y-86330000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.P,C54,2*
 G04 #@! TO.N,GND*
 X169172000Y-95281000D03*
@@ -1129,7 +1154,7 @@ G04 #@! TO.P,D11,2*
 G04 #@! TO.N,+3V3*
 X179190000Y-78880000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.P,GPDI1,0*
 G04 #@! TO.N,GND*
 X152546000Y-69312000D03*
@@ -1137,7 +1162,7 @@ X138046000Y-69312000D03*
 X153146000Y-64412000D03*
 X137446000Y-64412000D03*
 G04 #@! TD*
-D32*
+D34*
 G04 #@! TO.P,D10,1*
 G04 #@! TO.N,/power/WAKE*
 X169050000Y-84280000D03*
@@ -1229,12 +1254,12 @@ G04 #@! TO.P,D26,2*
 G04 #@! TO.N,USB_FPGA_PULL_D-*
 X179444000Y-72322000D03*
 G04 #@! TD*
-D33*
+D35*
 G04 #@! TO.P,AE1,1*
 G04 #@! TO.N,/usb/ANT_433MHz*
 X182888000Y-111603000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R49,1*
 G04 #@! TO.N,USB_FTDI_D-*
 X113277000Y-74360000D03*
@@ -1249,7 +1274,7 @@ G04 #@! TO.P,R50,1*
 G04 #@! TO.N,USB_FTDI_D+*
 X111372000Y-74360000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R51,2*
 G04 #@! TO.N,/blinkey/SWPU*
 X155455000Y-72487000D03*
@@ -1257,7 +1282,7 @@ G04 #@! TO.P,R51,1*
 G04 #@! TO.N,2V5_3V3*
 X157205000Y-72487000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R52,2*
 G04 #@! TO.N,/usb/FPD-*
 X171331000Y-66278000D03*
@@ -1272,7 +1297,7 @@ G04 #@! TO.P,R53,2*
 G04 #@! TO.N,/usb/FPD+*
 X169919000Y-66278000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R54,2*
 G04 #@! TO.N,Net-(D26-Pad1)*
 X174477000Y-65738000D03*
@@ -1280,7 +1305,7 @@ G04 #@! TO.P,R54,1*
 G04 #@! TO.N,USB_FPGA_D-*
 X172727000Y-65738000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R56,1*
 G04 #@! TO.N,GND*
 X128390000Y-106321000D03*
@@ -1316,7 +1341,7 @@ G04 #@! TO.P,R60,2*
 G04 #@! TO.N,/analog/AUDIO_V*
 X122294000Y-72483000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R61,1*
 G04 #@! TO.N,GPDI_CEC*
 X145655000Y-69900000D03*
@@ -1324,20 +1349,20 @@ G04 #@! TO.P,R61,2*
 G04 #@! TO.N,/gpdi/FPDI_CEC*
 X143905000Y-69900000D03*
 G04 #@! TD*
-D34*
+D36*
 G04 #@! TO.P,J3,1*
 G04 #@! TO.N,/wifi/WIFIEN*
 X102990000Y-95710000D03*
-D35*
+D37*
 G04 #@! TO.P,J3,2*
 G04 #@! TO.N,GND*
 X105530000Y-95710000D03*
 G04 #@! TD*
-D34*
+D36*
 G04 #@! TO.P,J5,1*
 G04 #@! TO.N,+2V5*
 X130056000Y-71725000D03*
-D35*
+D37*
 G04 #@! TO.P,J5,2*
 G04 #@! TO.N,2V5_3V3*
 X132596000Y-71725000D03*
@@ -1345,7 +1370,7 @@ G04 #@! TO.P,J5,3*
 G04 #@! TO.N,+3V3*
 X135136000Y-71725000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R40,1*
 G04 #@! TO.N,Net-(D24-Pad1)*
 X166631000Y-65738000D03*
@@ -1353,7 +1378,7 @@ G04 #@! TO.P,R40,2*
 G04 #@! TO.N,USB_FPGA_D+*
 X168381000Y-65738000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R55,1*
 G04 #@! TO.N,/flash/FPGA_DONE*
 X134740000Y-96740000D03*
@@ -1361,33 +1386,7 @@ G04 #@! TO.P,R55,2*
 G04 #@! TO.N,PROG_DONE*
 X134740000Y-98490000D03*
 G04 #@! TD*
-D36*
-G04 #@! TO.P,U11,1*
-G04 #@! TO.N,GND*
-X141980000Y-67706500D03*
-D37*
-G04 #@! TO.P,U11,2*
-G04 #@! TO.N,+3V3*
-X141980000Y-66436500D03*
-G04 #@! TO.P,U11,3*
-G04 #@! TO.N,FPDI_SCL*
-X141980000Y-65166500D03*
-G04 #@! TO.P,U11,4*
-G04 #@! TO.N,FPDI_SDA*
-X141980000Y-63896500D03*
-G04 #@! TO.P,U11,5*
-G04 #@! TO.N,GPDI_SDA*
-X147380000Y-63896500D03*
-G04 #@! TO.P,U11,6*
-G04 #@! TO.N,GPDI_SCL*
-X147380000Y-65166500D03*
-G04 #@! TO.P,U11,7*
-G04 #@! TO.N,/gpdi/VREF2*
-X147380000Y-66436500D03*
-G04 #@! TO.P,U11,8*
-X147380000Y-67706500D03*
-G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.P,C55,1*
 G04 #@! TO.N,/power/RTCVDD*
 X179078000Y-90963000D03*
@@ -1395,7 +1394,7 @@ G04 #@! TO.P,C55,2*
 G04 #@! TO.N,GND*
 X179078000Y-92873000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R65,1*
 G04 #@! TO.N,+3V3*
 X177300000Y-92793000D03*
@@ -1425,7 +1424,7 @@ G04 #@! TO.P,L3,1*
 G04 #@! TO.N,/power/L3*
 X157600000Y-74755000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R1,2*
 G04 #@! TO.N,/power/PWREN*
 X171175000Y-82375000D03*
@@ -1433,7 +1432,7 @@ G04 #@! TO.P,R1,1*
 G04 #@! TO.N,/power/WAKE*
 X169425000Y-82375000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R2,2*
 G04 #@! TO.N,GND*
 X172840000Y-78960000D03*
@@ -1448,7 +1447,7 @@ G04 #@! TO.P,R3,2*
 G04 #@! TO.N,/power/PWRBTn*
 X162045000Y-69435000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R4,1*
 G04 #@! TO.N,/power/HOLD*
 X176890000Y-80470000D03*
@@ -1456,7 +1455,7 @@ G04 #@! TO.P,R4,2*
 G04 #@! TO.N,/power/PWREN*
 X175140000Y-80470000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R5,1*
 G04 #@! TO.N,/power/SHUT*
 X174110000Y-75150000D03*
@@ -1492,7 +1491,7 @@ G04 #@! TO.P,R9,1*
 G04 #@! TO.N,nRESET*
 X128390000Y-108805000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R10,2*
 G04 #@! TO.N,FTDI_nSLEEP*
 X151264000Y-103076000D03*
@@ -1500,7 +1499,7 @@ G04 #@! TO.P,R10,1*
 G04 #@! TO.N,/power/FTDI_nSUSPEND*
 X153014000Y-103076000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R11,2*
 G04 #@! TO.N,/flash/FLASH_nWP*
 X119515000Y-80093000D03*
@@ -1515,7 +1514,7 @@ G04 #@! TO.P,R12,2*
 G04 #@! TO.N,/flash/FLASH_nHOLD*
 X114420000Y-87469000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R13,2*
 G04 #@! TO.N,GND*
 X175140000Y-78565000D03*
@@ -1551,7 +1550,7 @@ G04 #@! TO.P,R17,2*
 G04 #@! TO.N,/analog/AUDIO_L*
 X124721000Y-80470000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R18,2*
 G04 #@! TO.N,/analog/AUDIO_R*
 X130422000Y-73898000D03*
@@ -1601,7 +1600,7 @@ G04 #@! TO.P,R24,2*
 G04 #@! TO.N,/gpdi/VREF2*
 X150615000Y-65897000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R25,2*
 G04 #@! TO.N,GPDI_SCL*
 X148300000Y-72487000D03*
@@ -1616,7 +1615,7 @@ G04 #@! TO.P,R26,2*
 G04 #@! TO.N,GPDI_SDA*
 X148612000Y-69693000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R27,2*
 G04 #@! TO.N,/flash/FLASH_MOSI*
 X129025000Y-95300000D03*
@@ -1645,7 +1644,7 @@ G04 #@! TO.P,R30,2*
 G04 #@! TO.N,/flash/FLASH_nCS*
 X115690000Y-80093000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R31,2*
 G04 #@! TO.N,/flash/FPGA_PROGRAMN*
 X142755000Y-98250000D03*
@@ -1653,7 +1652,7 @@ G04 #@! TO.P,R31,1*
 G04 #@! TO.N,+3V3*
 X144505000Y-98250000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R32,1*
 G04 #@! TO.N,+3V3*
 X132835000Y-98490000D03*
@@ -1668,7 +1667,7 @@ G04 #@! TO.P,R33,1*
 G04 #@! TO.N,+3V3*
 X130930000Y-98490000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R34,1*
 G04 #@! TO.N,+3V3*
 X102115000Y-103600000D03*
@@ -1683,7 +1682,7 @@ G04 #@! TO.P,R35,1*
 G04 #@! TO.N,WIFI_EN*
 X103865000Y-102060000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,R38,1*
 G04 #@! TO.N,/sdcard/SD3V3*
 X103576500Y-99905000D03*
@@ -1691,7 +1690,7 @@ G04 #@! TO.P,R38,2*
 G04 #@! TO.N,+3V3*
 X103576500Y-98155000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.P,R39,1*
 G04 #@! TO.N,+3V3*
 X164190000Y-96345000D03*
@@ -1734,7 +1733,7 @@ G04 #@! TO.P,RA3,2*
 G04 #@! TO.N,/power/FB3*
 X153395000Y-81105000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.P,RB1,2*
 G04 #@! TO.N,/power/FB1*
 X158235000Y-92775000D03*
diff --git a/plot/ulx3s-B.Mask.gbs b/plot/ulx3s-B.Mask.gbs
index 7d7ba8b..431a8ce 100644
--- a/plot/ulx3s-B.Mask.gbs
+++ b/plot/ulx3s-B.Mask.gbs
@@ -1,45 +1,45 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-08T13:44:43+02:00*
+G04 #@! TF.CreationDate,2018-06-08T19:59:37+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Soldermask,Bot*
 G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:43 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:37 2018*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
-%ADD10R,0.600000X2.100000*%
-%ADD11O,0.700000X2.200000*%
-%ADD12O,1.827200X1.827200*%
-%ADD13R,1.727200X1.727200*%
-%ADD14R,0.700000X1.200000*%
-%ADD15C,5.600000*%
-%ADD16R,1.000000X0.400000*%
-%ADD17R,1.727200X2.032000*%
-%ADD18O,1.827200X2.132000*%
-%ADD19R,3.500000X3.300000*%
-%ADD20C,9.100000*%
-%ADD21C,1.800000*%
-%ADD22R,0.600000X1.550000*%
-%ADD23O,0.700000X1.650000*%
-%ADD24O,2.600000X1.000000*%
-%ADD25O,1.000000X2.600000*%
-%ADD26R,6.000000X6.000000*%
-%ADD27R,1.800000X1.400000*%
-%ADD28R,0.970000X1.500000*%
-%ADD29R,0.670000X1.000000*%
-%ADD30R,1.500000X0.970000*%
-%ADD31R,1.000000X0.670000*%
-%ADD32C,2.100000*%
-%ADD33R,1.000000X1.000000*%
-%ADD34C,0.400000*%
-%ADD35R,1.700000X1.700000*%
-%ADD36O,1.800000X1.800000*%
-%ADD37R,1.550000X0.600000*%
-%ADD38O,1.650000X0.700000*%
+%ADD10R,1.550000X0.600000*%
+%ADD11O,1.650000X0.700000*%
+%ADD12R,1.000000X0.400000*%
+%ADD13R,0.600000X2.100000*%
+%ADD14O,0.700000X2.200000*%
+%ADD15R,0.600000X1.550000*%
+%ADD16O,0.700000X1.650000*%
+%ADD17R,0.700000X1.200000*%
+%ADD18O,2.600000X1.000000*%
+%ADD19O,1.000000X2.600000*%
+%ADD20R,6.000000X6.000000*%
+%ADD21O,1.827200X1.827200*%
+%ADD22R,1.727200X1.727200*%
+%ADD23C,5.600000*%
+%ADD24R,1.727200X2.032000*%
+%ADD25O,1.827200X2.132000*%
+%ADD26R,3.500000X3.300000*%
+%ADD27C,9.100000*%
+%ADD28C,1.800000*%
+%ADD29R,1.800000X1.400000*%
+%ADD30R,0.970000X1.500000*%
+%ADD31R,0.670000X1.000000*%
+%ADD32R,1.500000X0.970000*%
+%ADD33R,1.000000X0.670000*%
+%ADD34C,2.100000*%
+%ADD35R,1.000000X1.000000*%
+%ADD36C,0.400000*%
+%ADD37R,1.700000X1.700000*%
+%ADD38O,1.800000X1.800000*%
 %ADD39R,1.500000X2.700000*%
 %ADD40R,1.295000X1.400000*%
 %ADD41R,1.400000X1.295000*%
@@ -48,9 +48,44 @@ G04 APERTURE LIST*
 %ADD44R,0.900000X0.800000*%
 G04 APERTURE END LIST*
 D10*
+G04 #@! TO.C,U11*
+X141980000Y-67706500D03*
+D11*
+X141980000Y-66436500D03*
+X141980000Y-65166500D03*
+X141980000Y-63896500D03*
+X147380000Y-63896500D03*
+X147380000Y-65166500D03*
+X147380000Y-66436500D03*
+X147380000Y-67706500D03*
+G04 #@! TD*
+D12*
+G04 #@! TO.C,U6*
+X129935000Y-104215000D03*
+X129935000Y-104865000D03*
+X129935000Y-105515000D03*
+X129935000Y-106165000D03*
+X129935000Y-106815000D03*
+X129935000Y-107465000D03*
+X129935000Y-108115000D03*
+X129935000Y-108765000D03*
+X129935000Y-109415000D03*
+X129935000Y-110065000D03*
+X135735000Y-110065000D03*
+X135735000Y-109415000D03*
+X135735000Y-108765000D03*
+X135735000Y-108115000D03*
+X135735000Y-107465000D03*
+X135735000Y-106815000D03*
+X135735000Y-106165000D03*
+X135735000Y-105515000D03*
+X135735000Y-104865000D03*
+X135735000Y-104215000D03*
+G04 #@! TD*
+D13*
 G04 #@! TO.C,U10*
 X116340000Y-82520000D03*
-D11*
+D14*
 X117610000Y-82520000D03*
 X118880000Y-82520000D03*
 X120150000Y-82520000D03*
@@ -59,14 +94,93 @@ X118880000Y-89124000D03*
 X117610000Y-89124000D03*
 X116340000Y-89124000D03*
 G04 #@! TD*
-D12*
+D15*
+G04 #@! TO.C,U7*
+X175395000Y-96015000D03*
+D16*
+X174125000Y-96015000D03*
+X172855000Y-96015000D03*
+X171585000Y-96015000D03*
+X171585000Y-90615000D03*
+X172855000Y-90615000D03*
+X174125000Y-90615000D03*
+X175395000Y-90615000D03*
+G04 #@! TD*
+D17*
+G04 #@! TO.C,U5*
+X157285000Y-77392000D03*
+X158235000Y-77392000D03*
+X159185000Y-77392000D03*
+X159185000Y-79992000D03*
+X157285000Y-79992000D03*
+G04 #@! TD*
+G04 #@! TO.C,U3*
+X159825000Y-90600000D03*
+X160775000Y-90600000D03*
+X161725000Y-90600000D03*
+X161725000Y-93200000D03*
+X159825000Y-93200000D03*
+G04 #@! TD*
+G04 #@! TO.C,U4*
+X104575000Y-86215000D03*
+X103625000Y-86215000D03*
+X102675000Y-86215000D03*
+X102675000Y-83615000D03*
+X104575000Y-83615000D03*
+G04 #@! TD*
+D18*
+G04 #@! TO.C,U9*
+X126230000Y-111000000D03*
+X126230000Y-109730000D03*
+X126230000Y-108460000D03*
+X126230000Y-107190000D03*
+X126230000Y-105920000D03*
+X126230000Y-104650000D03*
+X126230000Y-103380000D03*
+X126230000Y-102110000D03*
+X126230000Y-100840000D03*
+X126230000Y-99570000D03*
+X126230000Y-98300000D03*
+X126230000Y-97030000D03*
+X126230000Y-95760000D03*
+X126230000Y-94490000D03*
+D19*
+X122945000Y-93000000D03*
+X121675000Y-93000000D03*
+X120405000Y-93000000D03*
+X119135000Y-93000000D03*
+X117865000Y-93000000D03*
+X116595000Y-93000000D03*
+X115325000Y-93000000D03*
+X114055000Y-93000000D03*
+X112785000Y-93000000D03*
+X111515000Y-93000000D03*
+D18*
+X108230000Y-94490000D03*
+X108230000Y-95760000D03*
+X108230000Y-97030000D03*
+X108230000Y-98300000D03*
+X108230000Y-99570000D03*
+X108230000Y-100840000D03*
+X108230000Y-102110000D03*
+X108230000Y-103380000D03*
+X108230000Y-104650000D03*
+X108230000Y-105920000D03*
+X108230000Y-107190000D03*
+X108230000Y-108460000D03*
+X108230000Y-109730000D03*
+X108230000Y-111000000D03*
+D20*
+X116930000Y-103300000D03*
+G04 #@! TD*
+D21*
 G04 #@! TO.C,J1*
 X97910000Y-62690000D03*
 X95370000Y-62690000D03*
-D13*
+D22*
 X97910000Y-65230000D03*
 X95370000Y-65230000D03*
-D12*
+D21*
 X97910000Y-67770000D03*
 X95370000Y-67770000D03*
 X97910000Y-70310000D03*
@@ -83,10 +197,10 @@ X97910000Y-83010000D03*
 X95370000Y-83010000D03*
 X97910000Y-85550000D03*
 X95370000Y-85550000D03*
-D13*
+D22*
 X97910000Y-88090000D03*
 X95370000Y-88090000D03*
-D12*
+D21*
 X97910000Y-90630000D03*
 X95370000Y-90630000D03*
 X97910000Y-93170000D03*
@@ -101,43 +215,20 @@ X97910000Y-103330000D03*
 X95370000Y-103330000D03*
 X97910000Y-105870000D03*
 X95370000Y-105870000D03*
-D13*
+D22*
 X97910000Y-108410000D03*
 X95370000Y-108410000D03*
-D12*
+D21*
 X97910000Y-110950000D03*
 X95370000Y-110950000D03*
 G04 #@! TD*
-D14*
-G04 #@! TO.C,U3*
-X159825000Y-90600000D03*
-X160775000Y-90600000D03*
-X161725000Y-90600000D03*
-X161725000Y-93200000D03*
-X159825000Y-93200000D03*
-G04 #@! TD*
-G04 #@! TO.C,U4*
-X104575000Y-86215000D03*
-X103625000Y-86215000D03*
-X102675000Y-86215000D03*
-X102675000Y-83615000D03*
-X104575000Y-83615000D03*
-G04 #@! TD*
-G04 #@! TO.C,U5*
-X157285000Y-77392000D03*
-X158235000Y-77392000D03*
-X159185000Y-77392000D03*
-X159185000Y-79992000D03*
-X157285000Y-79992000D03*
-G04 #@! TD*
-D12*
 G04 #@! TO.C,J2*
 X184270000Y-110950000D03*
 X186810000Y-110950000D03*
-D13*
+D22*
 X184270000Y-108410000D03*
 X186810000Y-108410000D03*
-D12*
+D21*
 X184270000Y-105870000D03*
 X186810000Y-105870000D03*
 X184270000Y-103330000D03*
@@ -154,10 +245,10 @@ X184270000Y-90630000D03*
 X186810000Y-90630000D03*
 X184270000Y-88090000D03*
 X186810000Y-88090000D03*
-D13*
+D22*
 X184270000Y-85550000D03*
 X186810000Y-85550000D03*
-D12*
+D21*
 X184270000Y-83010000D03*
 X186810000Y-83010000D03*
 X184270000Y-80470000D03*
@@ -172,14 +263,14 @@ X184270000Y-70310000D03*
 X186810000Y-70310000D03*
 X184270000Y-67770000D03*
 X186810000Y-67770000D03*
-D13*
+D22*
 X184270000Y-65230000D03*
 X186810000Y-65230000D03*
-D12*
+D21*
 X184270000Y-62690000D03*
 X186810000Y-62690000D03*
 G04 #@! TD*
-D15*
+D23*
 G04 #@! TO.C,H1*
 X102990000Y-108410000D03*
 G04 #@! TD*
@@ -192,43 +283,20 @@ G04 #@! TD*
 G04 #@! TO.C,H4*
 X102990000Y-65230000D03*
 G04 #@! TD*
-D16*
-G04 #@! TO.C,U6*
-X135735000Y-104215000D03*
-X135735000Y-104865000D03*
-X135735000Y-105515000D03*
-X135735000Y-106165000D03*
-X135735000Y-106815000D03*
-X135735000Y-107465000D03*
-X135735000Y-108115000D03*
-X135735000Y-108765000D03*
-X135735000Y-109415000D03*
-X135735000Y-110065000D03*
-X129935000Y-110065000D03*
-X129935000Y-109415000D03*
-X129935000Y-108765000D03*
-X129935000Y-108115000D03*
-X129935000Y-107465000D03*
-X129935000Y-106815000D03*
-X129935000Y-106165000D03*
-X129935000Y-105515000D03*
-X129935000Y-104865000D03*
-X129935000Y-104215000D03*
-G04 #@! TD*
-D13*
+D22*
 G04 #@! TO.C,J4*
 X140455000Y-104600000D03*
-D12*
+D21*
 X137915000Y-104600000D03*
 X140455000Y-107140000D03*
 X137915000Y-107140000D03*
 X140455000Y-109680000D03*
 X137915000Y-109680000D03*
 G04 #@! TD*
-D17*
+D24*
 G04 #@! TO.C,OLED1*
 X147440000Y-100790000D03*
-D18*
+D25*
 X144900000Y-100790000D03*
 X142360000Y-100790000D03*
 X139820000Y-100790000D03*
@@ -236,83 +304,26 @@ X137280000Y-100790000D03*
 X134740000Y-100790000D03*
 X132200000Y-100790000D03*
 G04 #@! TD*
-D19*
+D26*
 G04 #@! TO.C,BAT1*
 X172485000Y-105870000D03*
 X156685000Y-105870000D03*
-D20*
+D27*
 X164585000Y-105870000D03*
 G04 #@! TD*
-D21*
+D28*
 G04 #@! TO.C,AUDIO1*
 X124468000Y-66518000D03*
 X124468000Y-73518000D03*
 G04 #@! TD*
-D22*
-G04 #@! TO.C,U7*
-X175395000Y-96015000D03*
-D23*
-X174125000Y-96015000D03*
-X172855000Y-96015000D03*
-X171585000Y-96015000D03*
-X171585000Y-90615000D03*
-X172855000Y-90615000D03*
-X174125000Y-90615000D03*
-X175395000Y-90615000D03*
-G04 #@! TD*
-D24*
-G04 #@! TO.C,U9*
-X126230000Y-111000000D03*
-X126230000Y-109730000D03*
-X126230000Y-108460000D03*
-X126230000Y-107190000D03*
-X126230000Y-105920000D03*
-X126230000Y-104650000D03*
-X126230000Y-103380000D03*
-X126230000Y-102110000D03*
-X126230000Y-100840000D03*
-X126230000Y-99570000D03*
-X126230000Y-98300000D03*
-X126230000Y-97030000D03*
-X126230000Y-95760000D03*
-X126230000Y-94490000D03*
-D25*
-X122945000Y-93000000D03*
-X121675000Y-93000000D03*
-X120405000Y-93000000D03*
-X119135000Y-93000000D03*
-X117865000Y-93000000D03*
-X116595000Y-93000000D03*
-X115325000Y-93000000D03*
-X114055000Y-93000000D03*
-X112785000Y-93000000D03*
-X111515000Y-93000000D03*
-D24*
-X108230000Y-94490000D03*
-X108230000Y-95760000D03*
-X108230000Y-97030000D03*
-X108230000Y-98300000D03*
-X108230000Y-99570000D03*
-X108230000Y-100840000D03*
-X108230000Y-102110000D03*
-X108230000Y-103380000D03*
-X108230000Y-104650000D03*
-X108230000Y-105920000D03*
-X108230000Y-107190000D03*
-X108230000Y-108460000D03*
-X108230000Y-109730000D03*
-X108230000Y-111000000D03*
-D26*
-X116930000Y-103300000D03*
-G04 #@! TD*
-D27*
+D29*
 G04 #@! TO.C,Y2*
 X178576000Y-98522000D03*
 X172976000Y-98522000D03*
 X172976000Y-101322000D03*
 X178576000Y-101322000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.C,C47*
 X133546000Y-68550000D03*
 X135456000Y-68550000D03*
@@ -321,12 +332,12 @@ G04 #@! TO.C,C1*
 X102748500Y-81885000D03*
 X104658500Y-81885000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,C2*
 X153985000Y-96910000D03*
 X155735000Y-96910000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.C,C3*
 X156015000Y-90630000D03*
 X154105000Y-90630000D03*
@@ -335,17 +346,17 @@ G04 #@! TO.C,C4*
 X154105000Y-92535000D03*
 X156015000Y-92535000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.C,C5*
 X163315000Y-90945000D03*
 X163315000Y-92855000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,C6*
 X151645000Y-82375000D03*
 X153395000Y-82375000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.C,C7*
 X153475000Y-79200000D03*
 X151565000Y-79200000D03*
@@ -354,17 +365,17 @@ G04 #@! TO.C,C8*
 X153475000Y-77295000D03*
 X151565000Y-77295000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.C,C9*
 X160775000Y-79520000D03*
 X160775000Y-77610000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,C10*
 X108465000Y-81105000D03*
 X110215000Y-81105000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.C,C11*
 X108385000Y-84280000D03*
 X110295000Y-84280000D03*
@@ -373,17 +384,17 @@ G04 #@! TO.C,C12*
 X110295000Y-86185000D03*
 X108385000Y-86185000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.C,C13*
 X173221000Y-83833000D03*
 X173221000Y-85743000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,C14*
 X175380000Y-76900000D03*
 X175380000Y-75150000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.C,C15*
 X105276000Y-99967000D03*
 X105276000Y-98057000D03*
@@ -396,12 +407,12 @@ G04 #@! TO.C,C17*
 X138500000Y-90665000D03*
 X138500000Y-92575000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,C18*
 X150589600Y-64359000D03*
 X150589600Y-62609000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.C,C19*
 X138500000Y-82375000D03*
 X138500000Y-80465000D03*
@@ -410,7 +421,7 @@ G04 #@! TO.C,C20*
 X138500000Y-87575000D03*
 X138500000Y-85665000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.C,C21*
 X103706000Y-93061000D03*
 X101796000Y-93061000D03*
@@ -427,7 +438,7 @@ G04 #@! TO.C,C24*
 X151189000Y-74882000D03*
 X149279000Y-74882000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,C25*
 X140900000Y-87095000D03*
 X140900000Y-85345000D03*
@@ -452,7 +463,7 @@ G04 #@! TO.C,C30*
 X134900000Y-90145000D03*
 X134900000Y-91895000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,C31*
 X135225000Y-88420000D03*
 X136975000Y-88420000D03*
@@ -469,17 +480,17 @@ G04 #@! TO.C,C34*
 X158375000Y-82220000D03*
 X156625000Y-82220000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,C35*
 X177300000Y-94025000D03*
 X177300000Y-95775000D03*
 G04 #@! TD*
-D28*
+D30*
 G04 #@! TO.C,C46*
 X145342000Y-103584000D03*
 X147252000Y-103584000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,C48*
 X103995000Y-70963000D03*
 X102245000Y-70963000D03*
@@ -488,12 +499,12 @@ G04 #@! TO.C,C49*
 X103372000Y-91156000D03*
 X101622000Y-91156000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,C50*
 X179713000Y-88856000D03*
 X179713000Y-87106000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,C51*
 X180473000Y-103856000D03*
 X178723000Y-103856000D03*
@@ -506,7 +517,7 @@ G04 #@! TO.C,C53*
 X132827200Y-86330000D03*
 X134577200Y-86330000D03*
 G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.C,C54*
 X169172000Y-95281000D03*
 X169172000Y-97191000D03*
@@ -515,14 +526,14 @@ G04 #@! TO.C,D11*
 X179190000Y-80790000D03*
 X179190000Y-78880000D03*
 G04 #@! TD*
-D32*
+D34*
 G04 #@! TO.C,GPDI1*
 X152546000Y-69312000D03*
 X138046000Y-69312000D03*
 X153146000Y-64412000D03*
 X137446000Y-64412000D03*
 G04 #@! TD*
-D33*
+D35*
 G04 #@! TO.C,D10*
 X169050000Y-84280000D03*
 X171550000Y-84280000D03*
@@ -575,11 +586,11 @@ G04 #@! TO.C,D26*
 X179444000Y-69822000D03*
 X179444000Y-72322000D03*
 G04 #@! TD*
-D34*
+D36*
 G04 #@! TO.C,AE1*
 X182888000Y-111603000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R49*
 X113277000Y-74360000D03*
 X113277000Y-72610000D03*
@@ -588,12 +599,12 @@ G04 #@! TO.C,R50*
 X111372000Y-72610000D03*
 X111372000Y-74360000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R51*
 X155455000Y-72487000D03*
 X157205000Y-72487000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R52*
 X171331000Y-66278000D03*
 X171331000Y-68028000D03*
@@ -602,12 +613,12 @@ G04 #@! TO.C,R53*
 X169919000Y-68028000D03*
 X169919000Y-66278000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R54*
 X174477000Y-65738000D03*
 X172727000Y-65738000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R56*
 X128390000Y-106321000D03*
 X128390000Y-104571000D03*
@@ -628,52 +639,40 @@ G04 #@! TO.C,R60*
 X122294000Y-74233000D03*
 X122294000Y-72483000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R61*
 X145655000Y-69900000D03*
 X143905000Y-69900000D03*
 G04 #@! TD*
-D35*
+D37*
 G04 #@! TO.C,J3*
 X102990000Y-95710000D03*
-D36*
+D38*
 X105530000Y-95710000D03*
 G04 #@! TD*
-D35*
+D37*
 G04 #@! TO.C,J5*
 X130056000Y-71725000D03*
-D36*
+D38*
 X132596000Y-71725000D03*
 X135136000Y-71725000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R40*
 X166631000Y-65738000D03*
 X168381000Y-65738000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R55*
 X134740000Y-96740000D03*
 X134740000Y-98490000D03*
 G04 #@! TD*
-D37*
-G04 #@! TO.C,U11*
-X141980000Y-67706500D03*
-D38*
-X141980000Y-66436500D03*
-X141980000Y-65166500D03*
-X141980000Y-63896500D03*
-X147380000Y-63896500D03*
-X147380000Y-65166500D03*
-X147380000Y-66436500D03*
-X147380000Y-67706500D03*
-G04 #@! TD*
-D30*
+D32*
 G04 #@! TO.C,C55*
 X179078000Y-90963000D03*
 X179078000Y-92873000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R65*
 X177300000Y-92793000D03*
 X177300000Y-91043000D03*
@@ -691,12 +690,12 @@ G04 #@! TO.C,L3*
 X155060000Y-74755000D03*
 X157600000Y-74755000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R1*
 X171175000Y-82375000D03*
 X169425000Y-82375000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R2*
 X172840000Y-78960000D03*
 X172840000Y-80710000D03*
@@ -705,12 +704,12 @@ G04 #@! TO.C,R3*
 X162045000Y-71185000D03*
 X162045000Y-69435000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R4*
 X176890000Y-80470000D03*
 X175140000Y-80470000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R5*
 X174110000Y-75150000D03*
 X174110000Y-76900000D03*
@@ -731,12 +730,12 @@ G04 #@! TO.C,R9*
 X128390000Y-110555000D03*
 X128390000Y-108805000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R10*
 X151264000Y-103076000D03*
 X153014000Y-103076000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R11*
 X119515000Y-80093000D03*
 X119515000Y-78343000D03*
@@ -745,7 +744,7 @@ G04 #@! TO.C,R12*
 X114420000Y-89219000D03*
 X114420000Y-87469000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R13*
 X175140000Y-78565000D03*
 X176890000Y-78565000D03*
@@ -766,7 +765,7 @@ G04 #@! TO.C,R17*
 X126471000Y-80470000D03*
 X124721000Y-80470000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R18*
 X130422000Y-73898000D03*
 X130422000Y-75648000D03*
@@ -795,7 +794,7 @@ G04 #@! TO.C,R24*
 X150615000Y-67647000D03*
 X150615000Y-65897000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R25*
 X148300000Y-72487000D03*
 X150050000Y-72487000D03*
@@ -804,7 +803,7 @@ G04 #@! TO.C,R26*
 X150362000Y-69693000D03*
 X148612000Y-69693000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R27*
 X129025000Y-95300000D03*
 X129025000Y-97050000D03*
@@ -821,12 +820,12 @@ G04 #@! TO.C,R30*
 X115690000Y-78343000D03*
 X115690000Y-80093000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R31*
 X142755000Y-98250000D03*
 X144505000Y-98250000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R32*
 X132835000Y-98490000D03*
 X132835000Y-96740000D03*
@@ -835,7 +834,7 @@ G04 #@! TO.C,R33*
 X130930000Y-96740000D03*
 X130930000Y-98490000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R34*
 X102115000Y-103600000D03*
 X103865000Y-103600000D03*
@@ -844,12 +843,12 @@ G04 #@! TO.C,R35*
 X102115000Y-102060000D03*
 X103865000Y-102060000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,R38*
 X103576500Y-99905000D03*
 X103576500Y-98155000D03*
 G04 #@! TD*
-D29*
+D31*
 G04 #@! TO.C,R39*
 X164190000Y-96345000D03*
 X162440000Y-96345000D03*
@@ -874,7 +873,7 @@ G04 #@! TO.C,RA3*
 X151645000Y-81105000D03*
 X153395000Y-81105000D03*
 G04 #@! TD*
-D31*
+D33*
 G04 #@! TO.C,RB1*
 X158235000Y-92775000D03*
 X158235000Y-91025000D03*
diff --git a/plot/ulx3s-B.Paste.gbp b/plot/ulx3s-B.Paste.gbp
index 5159b04..a037043 100644
--- a/plot/ulx3s-B.Paste.gbp
+++ b/plot/ulx3s-B.Paste.gbp
@@ -1,35 +1,35 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-08T13:44:43+02:00*
+G04 #@! TF.CreationDate,2018-06-08T19:59:37+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Paste,Bot*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:43 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:37 2018*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
 %ADD10C,0.350000*%
-%ADD11R,0.600000X2.100000*%
-%ADD12O,0.600000X2.100000*%
-%ADD13R,0.700000X1.200000*%
-%ADD14R,1.000000X0.400000*%
-%ADD15R,3.500000X3.300000*%
+%ADD11R,1.550000X0.600000*%
+%ADD12O,1.550000X0.600000*%
+%ADD13R,1.000000X0.400000*%
+%ADD14R,0.600000X2.100000*%
+%ADD15O,0.600000X2.100000*%
 %ADD16R,0.600000X1.550000*%
 %ADD17O,0.600000X1.550000*%
-%ADD18O,2.500000X0.900000*%
-%ADD19O,0.900000X2.500000*%
-%ADD20R,6.000000X6.000000*%
-%ADD21R,1.800000X1.400000*%
-%ADD22R,0.970000X1.500000*%
-%ADD23R,0.670000X1.000000*%
-%ADD24R,1.500000X0.970000*%
-%ADD25R,1.000000X0.670000*%
-%ADD26R,1.000000X1.000000*%
-%ADD27R,1.550000X0.600000*%
-%ADD28O,1.550000X0.600000*%
+%ADD18R,0.700000X1.200000*%
+%ADD19O,2.500000X0.900000*%
+%ADD20O,0.900000X2.500000*%
+%ADD21R,6.000000X6.000000*%
+%ADD22R,3.500000X3.300000*%
+%ADD23R,1.800000X1.400000*%
+%ADD24R,0.970000X1.500000*%
+%ADD25R,0.670000X1.000000*%
+%ADD26R,1.500000X0.970000*%
+%ADD27R,1.000000X0.670000*%
+%ADD28R,1.000000X1.000000*%
 %ADD29R,1.500000X2.700000*%
 %ADD30R,1.295000X1.400000*%
 %ADD31R,1.400000X1.295000*%
@@ -47,9 +47,44 @@ X150296000Y-70562000D02*
 X150296000Y-71062000D01*
 G04 #@! TD*
 D11*
+G04 #@! TO.C,U11*
+X141980000Y-67706500D03*
+D12*
+X141980000Y-66436500D03*
+X141980000Y-65166500D03*
+X141980000Y-63896500D03*
+X147380000Y-63896500D03*
+X147380000Y-65166500D03*
+X147380000Y-66436500D03*
+X147380000Y-67706500D03*
+G04 #@! TD*
+D13*
+G04 #@! TO.C,U6*
+X129935000Y-104215000D03*
+X129935000Y-104865000D03*
+X129935000Y-105515000D03*
+X129935000Y-106165000D03*
+X129935000Y-106815000D03*
+X129935000Y-107465000D03*
+X129935000Y-108115000D03*
+X129935000Y-108765000D03*
+X129935000Y-109415000D03*
+X129935000Y-110065000D03*
+X135735000Y-110065000D03*
+X135735000Y-109415000D03*
+X135735000Y-108765000D03*
+X135735000Y-108115000D03*
+X135735000Y-107465000D03*
+X135735000Y-106815000D03*
+X135735000Y-106165000D03*
+X135735000Y-105515000D03*
+X135735000Y-104865000D03*
+X135735000Y-104215000D03*
+G04 #@! TD*
+D14*
 G04 #@! TO.C,U10*
 X116340000Y-82520000D03*
-D12*
+D15*
 X117610000Y-82520000D03*
 X118880000Y-82520000D03*
 X120150000Y-82520000D03*
@@ -58,7 +93,26 @@ X118880000Y-89124000D03*
 X117610000Y-89124000D03*
 X116340000Y-89124000D03*
 G04 #@! TD*
-D13*
+D16*
+G04 #@! TO.C,U7*
+X175395000Y-96015000D03*
+D17*
+X174125000Y-96015000D03*
+X172855000Y-96015000D03*
+X171585000Y-96015000D03*
+X171585000Y-90615000D03*
+X172855000Y-90615000D03*
+X174125000Y-90615000D03*
+X175395000Y-90615000D03*
+G04 #@! TD*
+D18*
+G04 #@! TO.C,U5*
+X157285000Y-77392000D03*
+X158235000Y-77392000D03*
+X159185000Y-77392000D03*
+X159185000Y-79992000D03*
+X157285000Y-79992000D03*
+G04 #@! TD*
 G04 #@! TO.C,U3*
 X159825000Y-90600000D03*
 X160775000Y-90600000D03*
@@ -73,54 +127,7 @@ X102675000Y-86215000D03*
 X102675000Y-83615000D03*
 X104575000Y-83615000D03*
 G04 #@! TD*
-G04 #@! TO.C,U5*
-X157285000Y-77392000D03*
-X158235000Y-77392000D03*
-X159185000Y-77392000D03*
-X159185000Y-79992000D03*
-X157285000Y-79992000D03*
-G04 #@! TD*
-D14*
-G04 #@! TO.C,U6*
-X135735000Y-104215000D03*
-X135735000Y-104865000D03*
-X135735000Y-105515000D03*
-X135735000Y-106165000D03*
-X135735000Y-106815000D03*
-X135735000Y-107465000D03*
-X135735000Y-108115000D03*
-X135735000Y-108765000D03*
-X135735000Y-109415000D03*
-X135735000Y-110065000D03*
-X129935000Y-110065000D03*
-X129935000Y-109415000D03*
-X129935000Y-108765000D03*
-X129935000Y-108115000D03*
-X129935000Y-107465000D03*
-X129935000Y-106815000D03*
-X129935000Y-106165000D03*
-X129935000Y-105515000D03*
-X129935000Y-104865000D03*
-X129935000Y-104215000D03*
-G04 #@! TD*
-D15*
-G04 #@! TO.C,BAT1*
-X172485000Y-105870000D03*
-X156685000Y-105870000D03*
-G04 #@! TD*
-D16*
-G04 #@! TO.C,U7*
-X175395000Y-96015000D03*
-D17*
-X174125000Y-96015000D03*
-X172855000Y-96015000D03*
-X171585000Y-96015000D03*
-X171585000Y-90615000D03*
-X172855000Y-90615000D03*
-X174125000Y-90615000D03*
-X175395000Y-90615000D03*
-G04 #@! TD*
-D18*
+D19*
 G04 #@! TO.C,U9*
 X126230000Y-111000000D03*
 X126230000Y-109730000D03*
@@ -136,7 +143,7 @@ X126230000Y-98300000D03*
 X126230000Y-97030000D03*
 X126230000Y-95760000D03*
 X126230000Y-94490000D03*
-D19*
+D20*
 X122945000Y-93000000D03*
 X121675000Y-93000000D03*
 X120405000Y-93000000D03*
@@ -147,7 +154,7 @@ X115325000Y-93000000D03*
 X114055000Y-93000000D03*
 X112785000Y-93000000D03*
 X111515000Y-93000000D03*
-D18*
+D19*
 X108230000Y-94490000D03*
 X108230000Y-95760000D03*
 X108230000Y-97030000D03*
@@ -162,17 +169,22 @@ X108230000Y-107190000D03*
 X108230000Y-108460000D03*
 X108230000Y-109730000D03*
 X108230000Y-111000000D03*
-D20*
+D21*
 X116930000Y-103300000D03*
 G04 #@! TD*
-D21*
+D22*
+G04 #@! TO.C,BAT1*
+X172485000Y-105870000D03*
+X156685000Y-105870000D03*
+G04 #@! TD*
+D23*
 G04 #@! TO.C,Y2*
 X178576000Y-98522000D03*
 X172976000Y-98522000D03*
 X172976000Y-101322000D03*
 X178576000Y-101322000D03*
 G04 #@! TD*
-D22*
+D24*
 G04 #@! TO.C,C47*
 X133546000Y-68550000D03*
 X135456000Y-68550000D03*
@@ -181,12 +193,12 @@ G04 #@! TO.C,C1*
 X102748500Y-81885000D03*
 X104658500Y-81885000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,C2*
 X153985000Y-96910000D03*
 X155735000Y-96910000D03*
 G04 #@! TD*
-D22*
+D24*
 G04 #@! TO.C,C3*
 X156015000Y-90630000D03*
 X154105000Y-90630000D03*
@@ -195,17 +207,17 @@ G04 #@! TO.C,C4*
 X154105000Y-92535000D03*
 X156015000Y-92535000D03*
 G04 #@! TD*
-D24*
+D26*
 G04 #@! TO.C,C5*
 X163315000Y-90945000D03*
 X163315000Y-92855000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,C6*
 X151645000Y-82375000D03*
 X153395000Y-82375000D03*
 G04 #@! TD*
-D22*
+D24*
 G04 #@! TO.C,C7*
 X153475000Y-79200000D03*
 X151565000Y-79200000D03*
@@ -214,17 +226,17 @@ G04 #@! TO.C,C8*
 X153475000Y-77295000D03*
 X151565000Y-77295000D03*
 G04 #@! TD*
-D24*
+D26*
 G04 #@! TO.C,C9*
 X160775000Y-79520000D03*
 X160775000Y-77610000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,C10*
 X108465000Y-81105000D03*
 X110215000Y-81105000D03*
 G04 #@! TD*
-D22*
+D24*
 G04 #@! TO.C,C11*
 X108385000Y-84280000D03*
 X110295000Y-84280000D03*
@@ -233,17 +245,17 @@ G04 #@! TO.C,C12*
 X110295000Y-86185000D03*
 X108385000Y-86185000D03*
 G04 #@! TD*
-D24*
+D26*
 G04 #@! TO.C,C13*
 X173221000Y-83833000D03*
 X173221000Y-85743000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,C14*
 X175380000Y-76900000D03*
 X175380000Y-75150000D03*
 G04 #@! TD*
-D24*
+D26*
 G04 #@! TO.C,C15*
 X105276000Y-99967000D03*
 X105276000Y-98057000D03*
@@ -256,12 +268,12 @@ G04 #@! TO.C,C17*
 X138500000Y-90665000D03*
 X138500000Y-92575000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,C18*
 X150589600Y-64359000D03*
 X150589600Y-62609000D03*
 G04 #@! TD*
-D24*
+D26*
 G04 #@! TO.C,C19*
 X138500000Y-82375000D03*
 X138500000Y-80465000D03*
@@ -270,7 +282,7 @@ G04 #@! TO.C,C20*
 X138500000Y-87575000D03*
 X138500000Y-85665000D03*
 G04 #@! TD*
-D22*
+D24*
 G04 #@! TO.C,C21*
 X103706000Y-93061000D03*
 X101796000Y-93061000D03*
@@ -287,7 +299,7 @@ G04 #@! TO.C,C24*
 X151189000Y-74882000D03*
 X149279000Y-74882000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,C25*
 X140900000Y-87095000D03*
 X140900000Y-85345000D03*
@@ -312,7 +324,7 @@ G04 #@! TO.C,C30*
 X134900000Y-90145000D03*
 X134900000Y-91895000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,C31*
 X135225000Y-88420000D03*
 X136975000Y-88420000D03*
@@ -329,17 +341,17 @@ G04 #@! TO.C,C34*
 X158375000Y-82220000D03*
 X156625000Y-82220000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,C35*
 X177300000Y-94025000D03*
 X177300000Y-95775000D03*
 G04 #@! TD*
-D22*
+D24*
 G04 #@! TO.C,C46*
 X145342000Y-103584000D03*
 X147252000Y-103584000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,C48*
 X103995000Y-70963000D03*
 X102245000Y-70963000D03*
@@ -348,12 +360,12 @@ G04 #@! TO.C,C49*
 X103372000Y-91156000D03*
 X101622000Y-91156000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,C50*
 X179713000Y-88856000D03*
 X179713000Y-87106000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,C51*
 X180473000Y-103856000D03*
 X178723000Y-103856000D03*
@@ -366,7 +378,7 @@ G04 #@! TO.C,C53*
 X132827200Y-86330000D03*
 X134577200Y-86330000D03*
 G04 #@! TD*
-D24*
+D26*
 G04 #@! TO.C,C54*
 X169172000Y-95281000D03*
 X169172000Y-97191000D03*
@@ -375,7 +387,7 @@ G04 #@! TO.C,D11*
 X179190000Y-80790000D03*
 X179190000Y-78880000D03*
 G04 #@! TD*
-D26*
+D28*
 G04 #@! TO.C,D10*
 X169050000Y-84280000D03*
 X171550000Y-84280000D03*
@@ -428,7 +440,7 @@ G04 #@! TO.C,D26*
 X179444000Y-69822000D03*
 X179444000Y-72322000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R49*
 X113277000Y-74360000D03*
 X113277000Y-72610000D03*
@@ -437,12 +449,12 @@ G04 #@! TO.C,R50*
 X111372000Y-72610000D03*
 X111372000Y-74360000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,R51*
 X155455000Y-72487000D03*
 X157205000Y-72487000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R52*
 X171331000Y-66278000D03*
 X171331000Y-68028000D03*
@@ -451,12 +463,12 @@ G04 #@! TO.C,R53*
 X169919000Y-68028000D03*
 X169919000Y-66278000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,R54*
 X174477000Y-65738000D03*
 X172727000Y-65738000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R56*
 X128390000Y-106321000D03*
 X128390000Y-104571000D03*
@@ -477,7 +489,7 @@ G04 #@! TO.C,R60*
 X122294000Y-74233000D03*
 X122294000Y-72483000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,R61*
 X145655000Y-69900000D03*
 X143905000Y-69900000D03*
@@ -486,29 +498,17 @@ G04 #@! TO.C,R40*
 X166631000Y-65738000D03*
 X168381000Y-65738000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R55*
 X134740000Y-96740000D03*
 X134740000Y-98490000D03*
 G04 #@! TD*
-D27*
-G04 #@! TO.C,U11*
-X141980000Y-67706500D03*
-D28*
-X141980000Y-66436500D03*
-X141980000Y-65166500D03*
-X141980000Y-63896500D03*
-X147380000Y-63896500D03*
-X147380000Y-65166500D03*
-X147380000Y-66436500D03*
-X147380000Y-67706500D03*
-G04 #@! TD*
-D24*
+D26*
 G04 #@! TO.C,C55*
 X179078000Y-90963000D03*
 X179078000Y-92873000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R65*
 X177300000Y-92793000D03*
 X177300000Y-91043000D03*
@@ -526,12 +526,12 @@ G04 #@! TO.C,L3*
 X155060000Y-74755000D03*
 X157600000Y-74755000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,R1*
 X171175000Y-82375000D03*
 X169425000Y-82375000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R2*
 X172840000Y-78960000D03*
 X172840000Y-80710000D03*
@@ -540,12 +540,12 @@ G04 #@! TO.C,R3*
 X162045000Y-71185000D03*
 X162045000Y-69435000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,R4*
 X176890000Y-80470000D03*
 X175140000Y-80470000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R5*
 X174110000Y-75150000D03*
 X174110000Y-76900000D03*
@@ -566,12 +566,12 @@ G04 #@! TO.C,R9*
 X128390000Y-110555000D03*
 X128390000Y-108805000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,R10*
 X151264000Y-103076000D03*
 X153014000Y-103076000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R11*
 X119515000Y-80093000D03*
 X119515000Y-78343000D03*
@@ -580,7 +580,7 @@ G04 #@! TO.C,R12*
 X114420000Y-89219000D03*
 X114420000Y-87469000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,R13*
 X175140000Y-78565000D03*
 X176890000Y-78565000D03*
@@ -601,7 +601,7 @@ G04 #@! TO.C,R17*
 X126471000Y-80470000D03*
 X124721000Y-80470000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R18*
 X130422000Y-73898000D03*
 X130422000Y-75648000D03*
@@ -630,7 +630,7 @@ G04 #@! TO.C,R24*
 X150615000Y-67647000D03*
 X150615000Y-65897000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,R25*
 X148300000Y-72487000D03*
 X150050000Y-72487000D03*
@@ -639,7 +639,7 @@ G04 #@! TO.C,R26*
 X150362000Y-69693000D03*
 X148612000Y-69693000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R27*
 X129025000Y-95300000D03*
 X129025000Y-97050000D03*
@@ -656,12 +656,12 @@ G04 #@! TO.C,R30*
 X115690000Y-78343000D03*
 X115690000Y-80093000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,R31*
 X142755000Y-98250000D03*
 X144505000Y-98250000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R32*
 X132835000Y-98490000D03*
 X132835000Y-96740000D03*
@@ -670,7 +670,7 @@ G04 #@! TO.C,R33*
 X130930000Y-96740000D03*
 X130930000Y-98490000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,R34*
 X102115000Y-103600000D03*
 X103865000Y-103600000D03*
@@ -679,12 +679,12 @@ G04 #@! TO.C,R35*
 X102115000Y-102060000D03*
 X103865000Y-102060000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,R38*
 X103576500Y-99905000D03*
 X103576500Y-98155000D03*
 G04 #@! TD*
-D23*
+D25*
 G04 #@! TO.C,R39*
 X164190000Y-96345000D03*
 X162440000Y-96345000D03*
@@ -709,7 +709,7 @@ G04 #@! TO.C,RA3*
 X151645000Y-81105000D03*
 X153395000Y-81105000D03*
 G04 #@! TD*
-D25*
+D27*
 G04 #@! TO.C,RB1*
 X158235000Y-92775000D03*
 X158235000Y-91025000D03*
diff --git a/plot/ulx3s-B.SilkS.gbo b/plot/ulx3s-B.SilkS.gbo
index d45004a..3fd2137 100644
--- a/plot/ulx3s-B.SilkS.gbo
+++ b/plot/ulx3s-B.SilkS.gbo
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-08T13:44:43+02:00*
+G04 #@! TF.CreationDate,2018-06-08T19:59:37+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Legend,Bot*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:43 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:37 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -15,11 +15,118 @@ G04 APERTURE LIST*
 %ADD11C,0.200000*%
 %ADD12C,0.300000*%
 %ADD13C,0.150000*%
-%ADD14C,0.120000*%
-%ADD15C,0.500000*%
+%ADD14C,0.500000*%
+%ADD15C,0.120000*%
 %ADD16C,0.100000*%
 G04 APERTURE END LIST*
 D10*
+X99893476Y-96180380D02*
+X99703000Y-96180380D01*
+X99607761Y-96132761D01*
+X99560142Y-96085142D01*
+X99464904Y-95942285D01*
+X99417285Y-95751809D01*
+X99417285Y-95370857D01*
+X99464904Y-95275619D01*
+X99512523Y-95228000D01*
+X99607761Y-95180380D01*
+X99798238Y-95180380D01*
+X99893476Y-95228000D01*
+X99941095Y-95275619D01*
+X99988714Y-95370857D01*
+X99988714Y-95608952D01*
+X99941095Y-95704190D01*
+X99893476Y-95751809D01*
+X99798238Y-95799428D01*
+X99607761Y-95799428D01*
+X99512523Y-95751809D01*
+X99464904Y-95704190D01*
+X99417285Y-95608952D01*
+X100147476Y-101260380D02*
+X100718904Y-101260380D01*
+X100433190Y-101260380D02*
+X100433190Y-100260380D01*
+X100528428Y-100403238D01*
+X100623666Y-100498476D01*
+X100718904Y-100546095D01*
+X99195095Y-101260380D02*
+X99766523Y-101260380D01*
+X99480809Y-101260380D02*
+X99480809Y-100260380D01*
+X99576047Y-100403238D01*
+X99671285Y-100498476D01*
+X99766523Y-100546095D01*
+D11*
+X105037000Y-68804000D02*
+X108085000Y-68804000D01*
+X105037000Y-71344000D02*
+X105037000Y-68804000D01*
+X108085000Y-71344000D02*
+X105037000Y-71344000D01*
+X107323000Y-70074000D02*
+X108085000Y-70074000D01*
+X106307000Y-70074000D02*
+X105545000Y-70074000D01*
+X106307000Y-70836000D02*
+X106307000Y-70074000D01*
+X106307000Y-69312000D02*
+X106307000Y-70836000D01*
+X107323000Y-69312000D02*
+X107323000Y-70836000D01*
+X106307000Y-70074000D02*
+X107323000Y-69312000D01*
+X107323000Y-70836000D02*
+X106307000Y-70074000D01*
+D10*
+X182887904Y-72415619D02*
+X182840285Y-72368000D01*
+X182745047Y-72320380D01*
+X182506952Y-72320380D01*
+X182411714Y-72368000D01*
+X182364095Y-72415619D01*
+X182316476Y-72510857D01*
+X182316476Y-72606095D01*
+X182364095Y-72748952D01*
+X182935523Y-73320380D01*
+X182316476Y-73320380D01*
+X181411714Y-72320380D02*
+X181887904Y-72320380D01*
+X181935523Y-72796571D01*
+X181887904Y-72748952D01*
+X181792666Y-72701333D01*
+X181554571Y-72701333D01*
+X181459333Y-72748952D01*
+X181411714Y-72796571D01*
+X181364095Y-72891809D01*
+X181364095Y-73129904D01*
+X181411714Y-73225142D01*
+X181459333Y-73272761D01*
+X181554571Y-73320380D01*
+X181792666Y-73320380D01*
+X181887904Y-73272761D01*
+X181935523Y-73225142D01*
+X182887904Y-80035619D02*
+X182840285Y-79988000D01*
+X182745047Y-79940380D01*
+X182506952Y-79940380D01*
+X182411714Y-79988000D01*
+X182364095Y-80035619D01*
+X182316476Y-80130857D01*
+X182316476Y-80226095D01*
+X182364095Y-80368952D01*
+X182935523Y-80940380D01*
+X182316476Y-80940380D01*
+X181935523Y-80035619D02*
+X181887904Y-79988000D01*
+X181792666Y-79940380D01*
+X181554571Y-79940380D01*
+X181459333Y-79988000D01*
+X181411714Y-80035619D01*
+X181364095Y-80130857D01*
+X181364095Y-80226095D01*
+X181411714Y-80368952D01*
+X181983142Y-80940380D01*
+X181364095Y-80940380D01*
 X182887904Y-82575619D02*
 X182840285Y-82528000D01*
 X182745047Y-82480380D01*
@@ -138,9 +245,6 @@ X181364095Y-95799428D01*
 X181411714Y-95704190D01*
 X181459333Y-95656571D01*
 X181554571Y-95608952D01*
-D11*
-X104148000Y-100808000D02*
-X103640000Y-100554000D01*
 D12*
 X127003714Y-86984857D02*
 X127503714Y-86984857D01*
@@ -309,10 +413,6 @@ X146084761Y-110633333D01*
 X146037142Y-110728571D01*
 X146037142Y-111252380D01*
 D11*
-X134755000Y-104237000D02*
-G75*
-G03X134755000Y-104237000I-127000J0D01*
-G01*
 X135390000Y-80869000D02*
 X137422000Y-82393000D01*
 X135136000Y-84425000D02*
@@ -1793,86 +1893,124 @@ X167179857Y-92493571D01*
 X167037000Y-92493571D01*
 X166822714Y-92565000D01*
 X166751285Y-92636428D01*
-G04 #@! TO.C,REF\002A\002A*
-X131913000Y-65883000D02*
+D13*
+G04 #@! TO.C,U11*
+X144045000Y-68341500D02*
+X141378000Y-68341500D01*
+X145315000Y-68341500D02*
+X146712000Y-68341500D01*
+X146712000Y-63261500D02*
+X142648000Y-63261500D01*
+X145315000Y-68341500D02*
 G75*
-G03X131913000Y-65883000I-3000000J0D01*
+G03X144045000Y-68341500I-635000J0D01*
+G01*
+G04 #@! TO.C,U6*
+X130549000Y-110950000D02*
+X130549000Y-110569000D01*
+X135121000Y-110950000D02*
+X130549000Y-110950000D01*
+X135121000Y-110569000D02*
+X135121000Y-110950000D01*
+X135121000Y-103711000D02*
+X136137000Y-103711000D01*
+X135121000Y-103330000D02*
+X135121000Y-103711000D01*
+X133343000Y-103330000D02*
+X135121000Y-103330000D01*
+X130549000Y-103330000D02*
+X130549000Y-103711000D01*
+X132327000Y-103330000D02*
+X130549000Y-103330000D01*
+X132327000Y-103330000D02*
+G75*
+G03X133343000Y-103330000I508000J0D01*
 G01*
-D13*
 G04 #@! TO.C,U10*
-X116048803Y-84869500D02*
+X115705000Y-86584000D02*
+G75*
+G03X115705000Y-85060000I0J762000D01*
+G01*
+X115705000Y-86584000D02*
+X115705000Y-88108000D01*
+X115705000Y-85060000D02*
+X115705000Y-81504000D01*
+X120785000Y-88108000D02*
+X120785000Y-83536000D01*
+G04 #@! TO.C,U7*
+X176030000Y-92553000D02*
+X176030000Y-91283000D01*
+X170950000Y-95347000D02*
+X170950000Y-91283000D01*
+X176030000Y-92553000D02*
+G75*
+G03X176030000Y-94077000I0J-762000D01*
+G01*
+X176030000Y-94077000D02*
+X176030000Y-96871000D01*
+G04 #@! TO.C,U5*
+X157346803Y-78492000D02*
 G75*
-G03X116048803Y-84869500I-89803J0D01*
+G03X157346803Y-78492000I-111803J0D01*
 G01*
-X120785000Y-84044000D02*
-X115705000Y-84044000D01*
-X115705000Y-84552000D02*
-X120785000Y-84552000D01*
-X115670000Y-83747000D02*
-X115720000Y-83747000D01*
-X115670000Y-87897000D02*
-X115815000Y-87897000D01*
-X120820000Y-87897000D02*
-X120675000Y-87897000D01*
-X120820000Y-83747000D02*
-X120675000Y-83747000D01*
-X115670000Y-83747000D02*
-X115670000Y-87897000D01*
-X120820000Y-83747000D02*
-X120820000Y-87897000D01*
-X115720000Y-83747000D02*
-X115720000Y-82347000D01*
+X157935000Y-79592000D02*
+X158535000Y-79592000D01*
+X159735000Y-79592000D02*
+X159735000Y-77792000D01*
+X156735000Y-77792000D02*
+X156735000Y-79592000D01*
 G04 #@! TO.C,U3*
-X159886803Y-91500000D02*
+X159886803Y-91700000D02*
 G75*
-G03X159886803Y-91500000I-111803J0D01*
+G03X159886803Y-91700000I-111803J0D01*
 G01*
-X159275000Y-92800000D02*
-X162275000Y-92800000D01*
+X160475000Y-92800000D02*
+X161075000Y-92800000D01*
 X162275000Y-92800000D02*
 X162275000Y-91000000D01*
-X162275000Y-91000000D02*
-X159275000Y-91000000D01*
 X159275000Y-91000000D02*
 X159275000Y-92800000D01*
 G04 #@! TO.C,U4*
-X104736803Y-85315000D02*
+X104736803Y-85115000D02*
 G75*
-G03X104736803Y-85315000I-111803J0D01*
+G03X104736803Y-85115000I-111803J0D01*
 G01*
-X105125000Y-84015000D02*
-X102125000Y-84015000D01*
+X103925000Y-84015000D02*
+X103325000Y-84015000D01*
 X102125000Y-84015000D02*
 X102125000Y-85815000D01*
-X102125000Y-85815000D02*
-X105125000Y-85815000D01*
 X105125000Y-85815000D02*
 X105125000Y-84015000D01*
-G04 #@! TO.C,U5*
-X157346803Y-78292000D02*
+D14*
+G04 #@! TO.C,U9*
+X107607981Y-112354000D02*
 G75*
-G03X157346803Y-78292000I-111803J0D01*
+G03X107607981Y-112354000I-283981J0D01*
 G01*
-X156735000Y-79592000D02*
-X159735000Y-79592000D01*
-X159735000Y-79592000D02*
-X159735000Y-77792000D01*
-X159735000Y-77792000D02*
-X156735000Y-77792000D01*
-X156735000Y-77792000D02*
-X156735000Y-79592000D01*
-G04 #@! TO.C,U6*
-X130510000Y-103690000D02*
-X130510000Y-103790000D01*
-X130510000Y-110515000D02*
-X130510000Y-110490000D01*
-X135160000Y-110515000D02*
-X135160000Y-110490000D01*
-X136235000Y-103690000D02*
-X130510000Y-103690000D01*
-X135160000Y-110515000D02*
-X130510000Y-110515000D01*
-D14*
+D13*
+X126230000Y-112500000D02*
+X108230000Y-112500000D01*
+X108230000Y-118500000D02*
+X108230000Y-111750000D01*
+X126230000Y-118500000D02*
+X126230000Y-111750000D01*
+X126230000Y-118500000D02*
+X108230000Y-118500000D01*
+X126230000Y-93750000D02*
+X126230000Y-93000000D01*
+X126230000Y-93000000D02*
+X123730000Y-93000000D01*
+X110730000Y-93000000D02*
+X108230000Y-93000000D01*
+X108230000Y-93000000D02*
+X108230000Y-93750000D01*
+D12*
+G04 #@! TO.C,REF\002A\002A*
+X131913000Y-65883000D02*
+G75*
+G03X131913000Y-65883000I-3000000J0D01*
+G01*
+D15*
 G04 #@! TO.C,BAT1*
 X160091264Y-111074552D02*
 G75*
@@ -1917,46 +2055,6 @@ X157835000Y-102420000D01*
 X157835000Y-102420000D02*
 X157835000Y-103870000D01*
 D13*
-G04 #@! TO.C,U7*
-X175865803Y-94267500D02*
-G75*
-G03X175865803Y-94267500I-89803J0D01*
-G01*
-X170950000Y-95093000D02*
-X176030000Y-95093000D01*
-X176030000Y-94585000D02*
-X170950000Y-94585000D01*
-X176065000Y-95390000D02*
-X176015000Y-95390000D01*
-X176065000Y-91240000D02*
-X175920000Y-91240000D01*
-X170915000Y-91240000D02*
-X171060000Y-91240000D01*
-X170915000Y-95390000D02*
-X171060000Y-95390000D01*
-X176065000Y-95390000D02*
-X176065000Y-91240000D01*
-X170915000Y-95390000D02*
-X170915000Y-91240000D01*
-X176015000Y-95390000D02*
-X176015000Y-96790000D01*
-D15*
-G04 #@! TO.C,U9*
-X107607981Y-112354000D02*
-G75*
-G03X107607981Y-112354000I-283981J0D01*
-G01*
-D13*
-X126230000Y-112500000D02*
-X108230000Y-112500000D01*
-X108230000Y-118500000D02*
-X108230000Y-93000000D01*
-X126230000Y-118500000D02*
-X126230000Y-93000000D01*
-X126230000Y-93000000D02*
-X108230000Y-93000000D01*
-X126230000Y-118500000D02*
-X108230000Y-118500000D01*
 G04 #@! TO.C,Y2*
 X179776000Y-100322000D02*
 X179376000Y-100322000D01*
@@ -2022,7 +2120,7 @@ X147440000Y-93579000D02*
 X145440000Y-94579000D01*
 X149440000Y-94579000D02*
 X147440000Y-93579000D01*
-D14*
+D15*
 G04 #@! TO.C,C47*
 X134351000Y-69260000D02*
 X134651000Y-69260000D01*
@@ -2416,31 +2514,6 @@ X134230000Y-97395000D02*
 X134230000Y-97835000D01*
 X135250000Y-97395000D02*
 X135250000Y-97835000D01*
-D13*
-G04 #@! TO.C,U11*
-X143817303Y-68087500D02*
-G75*
-G03X143817303Y-68087500I-89803J0D01*
-G01*
-X142902000Y-63261500D02*
-X142902000Y-68341500D01*
-X143410000Y-68341500D02*
-X143410000Y-63261500D01*
-X142605000Y-68376500D02*
-X142605000Y-68326500D01*
-X146755000Y-68376500D02*
-X146755000Y-68231500D01*
-X146755000Y-63226500D02*
-X146755000Y-63371500D01*
-X142605000Y-63226500D02*
-X142605000Y-63371500D01*
-X142605000Y-68376500D02*
-X146755000Y-68376500D01*
-X142605000Y-63226500D02*
-X146755000Y-63226500D01*
-X142605000Y-68326500D02*
-X141205000Y-68326500D01*
-D14*
 G04 #@! TO.C,C55*
 X178368000Y-91768000D02*
 X178368000Y-92068000D01*
@@ -2975,56 +3048,66 @@ X123285312Y-66911268D01*
 X123285312Y-64722736D01*
 X123285312Y-64722736D01*
 G37*
-G04 #@! TO.C,REF\002A\002A*
-D12*
-X131234428Y-66461571D02*
-X131234428Y-65461571D01*
-X131234428Y-64961571D02*
-X131305857Y-65033000D01*
-X131234428Y-65104428D01*
-X131163000Y-65033000D01*
-X131234428Y-64961571D01*
-X131234428Y-65104428D01*
-X130520142Y-65461571D02*
-X130520142Y-66461571D01*
-X130520142Y-65604428D02*
-X130448714Y-65533000D01*
-X130305857Y-65461571D01*
-X130091571Y-65461571D01*
-X129948714Y-65533000D01*
-X129877285Y-65675857D01*
-X129877285Y-66461571D01*
-X128591571Y-66390142D02*
-X128734428Y-66461571D01*
-X129020142Y-66461571D01*
-X129163000Y-66390142D01*
-X129234428Y-66247285D01*
-X129234428Y-65675857D01*
-X129163000Y-65533000D01*
-X129020142Y-65461571D01*
-X128734428Y-65461571D01*
-X128591571Y-65533000D01*
-X128520142Y-65675857D01*
-X128520142Y-65818714D01*
-X129234428Y-65961571D01*
-X127877285Y-66461571D02*
-X127877285Y-65461571D01*
-X127877285Y-65604428D02*
-X127805857Y-65533000D01*
-X127663000Y-65461571D01*
-X127448714Y-65461571D01*
-X127305857Y-65533000D01*
-X127234428Y-65675857D01*
-X127234428Y-66461571D01*
-X127234428Y-65675857D02*
-X127163000Y-65533000D01*
-X127020142Y-65461571D01*
-X126805857Y-65461571D01*
-X126663000Y-65533000D01*
-X126591571Y-65675857D01*
-X126591571Y-66461571D01*
-G04 #@! TO.C,U10*
+G04 #@! TO.C,U11*
 D13*
+X145899095Y-61906380D02*
+X145899095Y-62715904D01*
+X145851476Y-62811142D01*
+X145803857Y-62858761D01*
+X145708619Y-62906380D01*
+X145518142Y-62906380D01*
+X145422904Y-62858761D01*
+X145375285Y-62811142D01*
+X145327666Y-62715904D01*
+X145327666Y-61906380D01*
+X144327666Y-62906380D02*
+X144899095Y-62906380D01*
+X144613380Y-62906380D02*
+X144613380Y-61906380D01*
+X144708619Y-62049238D01*
+X144803857Y-62144476D01*
+X144899095Y-62192095D01*
+X143375285Y-62906380D02*
+X143946714Y-62906380D01*
+X143661000Y-62906380D02*
+X143661000Y-61906380D01*
+X143756238Y-62049238D01*
+X143851476Y-62144476D01*
+X143946714Y-62192095D01*
+G04 #@! TO.C,U6*
+X137152904Y-102274380D02*
+X137152904Y-103083904D01*
+X137105285Y-103179142D01*
+X137057666Y-103226761D01*
+X136962428Y-103274380D01*
+X136771952Y-103274380D01*
+X136676714Y-103226761D01*
+X136629095Y-103179142D01*
+X136581476Y-103083904D01*
+X136581476Y-102274380D01*
+X135676714Y-102274380D02*
+X135867190Y-102274380D01*
+X135962428Y-102322000D01*
+X136010047Y-102369619D01*
+X136105285Y-102512476D01*
+X136152904Y-102702952D01*
+X136152904Y-103083904D01*
+X136105285Y-103179142D01*
+X136057666Y-103226761D01*
+X135962428Y-103274380D01*
+X135771952Y-103274380D01*
+X135676714Y-103226761D01*
+X135629095Y-103179142D01*
+X135581476Y-103083904D01*
+X135581476Y-102845809D01*
+X135629095Y-102750571D01*
+X135676714Y-102702952D01*
+X135771952Y-102655333D01*
+X135962428Y-102655333D01*
+X136057666Y-102702952D01*
+X136105285Y-102750571D01*
+X136152904Y-102845809D01*
+G04 #@! TO.C,U10*
 X123801095Y-88449380D02*
 X123801095Y-89258904D01*
 X123753476Y-89354142D01*
@@ -3063,8 +3146,49 @@ X121801095Y-88639857D01*
 X121753476Y-88544619D01*
 X121705857Y-88497000D01*
 X121610619Y-88449380D01*
-G04 #@! TO.C,U3*
+G04 #@! TO.C,U7*
+X170314904Y-90735380D02*
+X170314904Y-91544904D01*
+X170267285Y-91640142D01*
+X170219666Y-91687761D01*
+X170124428Y-91735380D01*
+X169933952Y-91735380D01*
+X169838714Y-91687761D01*
+X169791095Y-91640142D01*
+X169743476Y-91544904D01*
+X169743476Y-90735380D01*
+X169362523Y-90735380D02*
+X168695857Y-90735380D01*
+X169124428Y-91735380D01*
+G04 #@! TO.C,U5*
 D11*
+X160789904Y-80956380D02*
+X160789904Y-81765904D01*
+X160742285Y-81861142D01*
+X160694666Y-81908761D01*
+X160599428Y-81956380D01*
+X160408952Y-81956380D01*
+X160313714Y-81908761D01*
+X160266095Y-81861142D01*
+X160218476Y-81765904D01*
+X160218476Y-80956380D01*
+X159266095Y-80956380D02*
+X159742285Y-80956380D01*
+X159789904Y-81432571D01*
+X159742285Y-81384952D01*
+X159647047Y-81337333D01*
+X159408952Y-81337333D01*
+X159313714Y-81384952D01*
+X159266095Y-81432571D01*
+X159218476Y-81527809D01*
+X159218476Y-81765904D01*
+X159266095Y-81861142D01*
+X159313714Y-81908761D01*
+X159408952Y-81956380D01*
+X159647047Y-81956380D01*
+X159742285Y-81908761D01*
+X159789904Y-81861142D01*
+G04 #@! TO.C,U3*
 X161241904Y-94252380D02*
 X161241904Y-95061904D01*
 X161194285Y-95157142D01*
@@ -3105,118 +3229,8 @@ X100385714Y-84940880D01*
 X100623809Y-83893261D02*
 X100861904Y-84607547D01*
 X100242857Y-84607547D01*
-G04 #@! TO.C,U5*
-X160789904Y-80956380D02*
-X160789904Y-81765904D01*
-X160742285Y-81861142D01*
-X160694666Y-81908761D01*
-X160599428Y-81956380D01*
-X160408952Y-81956380D01*
-X160313714Y-81908761D01*
-X160266095Y-81861142D01*
-X160218476Y-81765904D01*
-X160218476Y-80956380D01*
-X159266095Y-80956380D02*
-X159742285Y-80956380D01*
-X159789904Y-81432571D01*
-X159742285Y-81384952D01*
-X159647047Y-81337333D01*
-X159408952Y-81337333D01*
-X159313714Y-81384952D01*
-X159266095Y-81432571D01*
-X159218476Y-81527809D01*
-X159218476Y-81765904D01*
-X159266095Y-81861142D01*
-X159313714Y-81908761D01*
-X159408952Y-81956380D01*
-X159647047Y-81956380D01*
-X159742285Y-81908761D01*
-X159789904Y-81861142D01*
-G04 #@! TO.C,U6*
-D13*
-X136771904Y-102274380D02*
-X136771904Y-103083904D01*
-X136724285Y-103179142D01*
-X136676666Y-103226761D01*
-X136581428Y-103274380D01*
-X136390952Y-103274380D01*
-X136295714Y-103226761D01*
-X136248095Y-103179142D01*
-X136200476Y-103083904D01*
-X136200476Y-102274380D01*
-X135295714Y-102274380D02*
-X135486190Y-102274380D01*
-X135581428Y-102322000D01*
-X135629047Y-102369619D01*
-X135724285Y-102512476D01*
-X135771904Y-102702952D01*
-X135771904Y-103083904D01*
-X135724285Y-103179142D01*
-X135676666Y-103226761D01*
-X135581428Y-103274380D01*
-X135390952Y-103274380D01*
-X135295714Y-103226761D01*
-X135248095Y-103179142D01*
-X135200476Y-103083904D01*
-X135200476Y-102845809D01*
-X135248095Y-102750571D01*
-X135295714Y-102702952D01*
-X135390952Y-102655333D01*
-X135581428Y-102655333D01*
-X135676666Y-102702952D01*
-X135724285Y-102750571D01*
-X135771904Y-102845809D01*
-G04 #@! TO.C,BAT1*
-X153094285Y-106728571D02*
-X152951428Y-106776190D01*
-X152903809Y-106823809D01*
-X152856190Y-106919047D01*
-X152856190Y-107061904D01*
-X152903809Y-107157142D01*
-X152951428Y-107204761D01*
-X153046666Y-107252380D01*
-X153427619Y-107252380D01*
-X153427619Y-106252380D01*
-X153094285Y-106252380D01*
-X152999047Y-106300000D01*
-X152951428Y-106347619D01*
-X152903809Y-106442857D01*
-X152903809Y-106538095D01*
-X152951428Y-106633333D01*
-X152999047Y-106680952D01*
-X153094285Y-106728571D01*
-X153427619Y-106728571D01*
-X152475238Y-106966666D02*
-X151999047Y-106966666D01*
-X152570476Y-107252380D02*
-X152237142Y-106252380D01*
-X151903809Y-107252380D01*
-X151713333Y-106252380D02*
-X151141904Y-106252380D01*
-X151427619Y-107252380D02*
-X151427619Y-106252380D01*
-X150284761Y-107252380D02*
-X150856190Y-107252380D01*
-X150570476Y-107252380D02*
-X150570476Y-106252380D01*
-X150665714Y-106395238D01*
-X150760952Y-106490476D01*
-X150856190Y-106538095D01*
-G04 #@! TO.C,U7*
-X170314904Y-90735380D02*
-X170314904Y-91544904D01*
-X170267285Y-91640142D01*
-X170219666Y-91687761D01*
-X170124428Y-91735380D01*
-X169933952Y-91735380D01*
-X169838714Y-91687761D01*
-X169791095Y-91640142D01*
-X169743476Y-91544904D01*
-X169743476Y-90735380D01*
-X169362523Y-90735380D02*
-X168695857Y-90735380D01*
-X169124428Y-91735380D01*
 G04 #@! TO.C,U9*
+D13*
 X126357904Y-91352380D02*
 X126357904Y-92161904D01*
 X126310285Y-92257142D01*
@@ -3568,6 +3582,91 @@ X121889380Y-110789714D01*
 X122603666Y-111123047D01*
 X121889380Y-111456380D01*
 X122889380Y-111456380D01*
+G04 #@! TO.C,REF\002A\002A*
+D12*
+X131234428Y-66461571D02*
+X131234428Y-65461571D01*
+X131234428Y-64961571D02*
+X131305857Y-65033000D01*
+X131234428Y-65104428D01*
+X131163000Y-65033000D01*
+X131234428Y-64961571D01*
+X131234428Y-65104428D01*
+X130520142Y-65461571D02*
+X130520142Y-66461571D01*
+X130520142Y-65604428D02*
+X130448714Y-65533000D01*
+X130305857Y-65461571D01*
+X130091571Y-65461571D01*
+X129948714Y-65533000D01*
+X129877285Y-65675857D01*
+X129877285Y-66461571D01*
+X128591571Y-66390142D02*
+X128734428Y-66461571D01*
+X129020142Y-66461571D01*
+X129163000Y-66390142D01*
+X129234428Y-66247285D01*
+X129234428Y-65675857D01*
+X129163000Y-65533000D01*
+X129020142Y-65461571D01*
+X128734428Y-65461571D01*
+X128591571Y-65533000D01*
+X128520142Y-65675857D01*
+X128520142Y-65818714D01*
+X129234428Y-65961571D01*
+X127877285Y-66461571D02*
+X127877285Y-65461571D01*
+X127877285Y-65604428D02*
+X127805857Y-65533000D01*
+X127663000Y-65461571D01*
+X127448714Y-65461571D01*
+X127305857Y-65533000D01*
+X127234428Y-65675857D01*
+X127234428Y-66461571D01*
+X127234428Y-65675857D02*
+X127163000Y-65533000D01*
+X127020142Y-65461571D01*
+X126805857Y-65461571D01*
+X126663000Y-65533000D01*
+X126591571Y-65675857D01*
+X126591571Y-66461571D01*
+G04 #@! TO.C,BAT1*
+D13*
+X153094285Y-106728571D02*
+X152951428Y-106776190D01*
+X152903809Y-106823809D01*
+X152856190Y-106919047D01*
+X152856190Y-107061904D01*
+X152903809Y-107157142D01*
+X152951428Y-107204761D01*
+X153046666Y-107252380D01*
+X153427619Y-107252380D01*
+X153427619Y-106252380D01*
+X153094285Y-106252380D01*
+X152999047Y-106300000D01*
+X152951428Y-106347619D01*
+X152903809Y-106442857D01*
+X152903809Y-106538095D01*
+X152951428Y-106633333D01*
+X152999047Y-106680952D01*
+X153094285Y-106728571D01*
+X153427619Y-106728571D01*
+X152475238Y-106966666D02*
+X151999047Y-106966666D01*
+X152570476Y-107252380D02*
+X152237142Y-106252380D01*
+X151903809Y-107252380D01*
+X151713333Y-106252380D02*
+X151141904Y-106252380D01*
+X151427619Y-107252380D02*
+X151427619Y-106252380D01*
+X150284761Y-107252380D02*
+X150856190Y-107252380D01*
+X150570476Y-107252380D02*
+X150570476Y-106252380D01*
+X150665714Y-106395238D01*
+X150760952Y-106490476D01*
+X150856190Y-106538095D01*
 G04 #@! TO.C,Y2*
 X180062190Y-96974190D02*
 X180062190Y-97450380D01*
@@ -4045,74 +4144,74 @@ X173815380Y-88639714D01*
 X173767761Y-88544476D01*
 X173720142Y-88496857D01*
 G04 #@! TO.C,C14*
-X167878142Y-76162142D02*
-X167925761Y-76114523D01*
-X167973380Y-75971666D01*
-X167973380Y-75876428D01*
-X167925761Y-75733571D01*
-X167830523Y-75638333D01*
-X167735285Y-75590714D01*
-X167544809Y-75543095D01*
-X167401952Y-75543095D01*
-X167211476Y-75590714D01*
-X167116238Y-75638333D01*
-X167021000Y-75733571D01*
-X166973380Y-75876428D01*
-X166973380Y-75971666D01*
-X167021000Y-76114523D01*
-X167068619Y-76162142D01*
-X167973380Y-77114523D02*
-X167973380Y-76543095D01*
-X167973380Y-76828809D02*
-X166973380Y-76828809D01*
-X167116238Y-76733571D01*
-X167211476Y-76638333D01*
-X167259095Y-76543095D01*
-X167306714Y-77971666D02*
-X167973380Y-77971666D01*
-X166925761Y-77733571D02*
-X167640047Y-77495476D01*
-X167640047Y-78114523D01*
+X168767142Y-75400142D02*
+X168814761Y-75352523D01*
+X168862380Y-75209666D01*
+X168862380Y-75114428D01*
+X168814761Y-74971571D01*
+X168719523Y-74876333D01*
+X168624285Y-74828714D01*
+X168433809Y-74781095D01*
+X168290952Y-74781095D01*
+X168100476Y-74828714D01*
+X168005238Y-74876333D01*
+X167910000Y-74971571D01*
+X167862380Y-75114428D01*
+X167862380Y-75209666D01*
+X167910000Y-75352523D01*
+X167957619Y-75400142D01*
+X168862380Y-76352523D02*
+X168862380Y-75781095D01*
+X168862380Y-76066809D02*
+X167862380Y-76066809D01*
+X168005238Y-75971571D01*
+X168100476Y-75876333D01*
+X168148095Y-75781095D01*
+X168195714Y-77209666D02*
+X168862380Y-77209666D01*
+X167814761Y-76971571D02*
+X168529047Y-76733476D01*
+X168529047Y-77352523D01*
 G04 #@! TO.C,C15*
-X106537142Y-101562142D02*
-X106584761Y-101514523D01*
-X106632380Y-101371666D01*
-X106632380Y-101276428D01*
-X106584761Y-101133571D01*
-X106489523Y-101038333D01*
-X106394285Y-100990714D01*
-X106203809Y-100943095D01*
-X106060952Y-100943095D01*
-X105870476Y-100990714D01*
-X105775238Y-101038333D01*
-X105680000Y-101133571D01*
-X105632380Y-101276428D01*
-X105632380Y-101371666D01*
-X105680000Y-101514523D01*
-X105727619Y-101562142D01*
-X106632380Y-102514523D02*
-X106632380Y-101943095D01*
-X106632380Y-102228809D02*
-X105632380Y-102228809D01*
-X105775238Y-102133571D01*
-X105870476Y-102038333D01*
-X105918095Y-101943095D01*
-X105632380Y-103419285D02*
-X105632380Y-102943095D01*
-X106108571Y-102895476D01*
-X106060952Y-102943095D01*
-X106013333Y-103038333D01*
-X106013333Y-103276428D01*
-X106060952Y-103371666D01*
-X106108571Y-103419285D01*
-X106203809Y-103466904D01*
-X106441904Y-103466904D01*
-X106537142Y-103419285D01*
-X106584761Y-103371666D01*
-X106632380Y-103276428D01*
-X106632380Y-103038333D01*
-X106584761Y-102943095D01*
-X106537142Y-102895476D01*
+X105775142Y-101308142D02*
+X105822761Y-101260523D01*
+X105870380Y-101117666D01*
+X105870380Y-101022428D01*
+X105822761Y-100879571D01*
+X105727523Y-100784333D01*
+X105632285Y-100736714D01*
+X105441809Y-100689095D01*
+X105298952Y-100689095D01*
+X105108476Y-100736714D01*
+X105013238Y-100784333D01*
+X104918000Y-100879571D01*
+X104870380Y-101022428D01*
+X104870380Y-101117666D01*
+X104918000Y-101260523D01*
+X104965619Y-101308142D01*
+X105870380Y-102260523D02*
+X105870380Y-101689095D01*
+X105870380Y-101974809D02*
+X104870380Y-101974809D01*
+X105013238Y-101879571D01*
+X105108476Y-101784333D01*
+X105156095Y-101689095D01*
+X104870380Y-103165285D02*
+X104870380Y-102689095D01*
+X105346571Y-102641476D01*
+X105298952Y-102689095D01*
+X105251333Y-102784333D01*
+X105251333Y-103022428D01*
+X105298952Y-103117666D01*
+X105346571Y-103165285D01*
+X105441809Y-103212904D01*
+X105679904Y-103212904D01*
+X105775142Y-103165285D01*
+X105822761Y-103117666D01*
+X105870380Y-103022428D01*
+X105870380Y-102784333D01*
+X105822761Y-102689095D01*
+X105775142Y-102641476D01*
 G04 #@! TO.C,C16*
 X166227142Y-86431142D02*
 X166274761Y-86383523D01*
@@ -5026,59 +5125,59 @@ X145511285Y-105314952D01*
 X145558904Y-105362571D01*
 X145606523Y-105457809D01*
 G04 #@! TO.C,C48*
-X103762857Y-72970142D02*
-X103810476Y-73017761D01*
-X103953333Y-73065380D01*
-X104048571Y-73065380D01*
-X104191428Y-73017761D01*
-X104286666Y-72922523D01*
-X104334285Y-72827285D01*
-X104381904Y-72636809D01*
-X104381904Y-72493952D01*
-X104334285Y-72303476D01*
-X104286666Y-72208238D01*
-X104191428Y-72113000D01*
-X104048571Y-72065380D01*
-X103953333Y-72065380D01*
-X103810476Y-72113000D01*
-X103762857Y-72160619D01*
-X102905714Y-72398714D02*
-X102905714Y-73065380D01*
-X103143809Y-72017761D02*
-X103381904Y-72732047D01*
-X102762857Y-72732047D01*
-X102239047Y-72493952D02*
-X102334285Y-72446333D01*
-X102381904Y-72398714D01*
-X102429523Y-72303476D01*
-X102429523Y-72255857D01*
-X102381904Y-72160619D01*
-X102334285Y-72113000D01*
-X102239047Y-72065380D01*
-X102048571Y-72065380D01*
-X101953333Y-72113000D01*
-X101905714Y-72160619D01*
-X101858095Y-72255857D01*
-X101858095Y-72303476D01*
-X101905714Y-72398714D01*
-X101953333Y-72446333D01*
-X102048571Y-72493952D01*
-X102239047Y-72493952D01*
-X102334285Y-72541571D01*
-X102381904Y-72589190D01*
-X102429523Y-72684428D01*
-X102429523Y-72874904D01*
-X102381904Y-72970142D01*
-X102334285Y-73017761D01*
-X102239047Y-73065380D01*
-X102048571Y-73065380D01*
-X101953333Y-73017761D01*
-X101905714Y-72970142D01*
-X101858095Y-72874904D01*
-X101858095Y-72684428D01*
-X101905714Y-72589190D01*
-X101953333Y-72541571D01*
-X102048571Y-72493952D01*
+X103774857Y-70050142D02*
+X103822476Y-70097761D01*
+X103965333Y-70145380D01*
+X104060571Y-70145380D01*
+X104203428Y-70097761D01*
+X104298666Y-70002523D01*
+X104346285Y-69907285D01*
+X104393904Y-69716809D01*
+X104393904Y-69573952D01*
+X104346285Y-69383476D01*
+X104298666Y-69288238D01*
+X104203428Y-69193000D01*
+X104060571Y-69145380D01*
+X103965333Y-69145380D01*
+X103822476Y-69193000D01*
+X103774857Y-69240619D01*
+X102917714Y-69478714D02*
+X102917714Y-70145380D01*
+X103155809Y-69097761D02*
+X103393904Y-69812047D01*
+X102774857Y-69812047D01*
+X102251047Y-69573952D02*
+X102346285Y-69526333D01*
+X102393904Y-69478714D01*
+X102441523Y-69383476D01*
+X102441523Y-69335857D01*
+X102393904Y-69240619D01*
+X102346285Y-69193000D01*
+X102251047Y-69145380D01*
+X102060571Y-69145380D01*
+X101965333Y-69193000D01*
+X101917714Y-69240619D01*
+X101870095Y-69335857D01*
+X101870095Y-69383476D01*
+X101917714Y-69478714D01*
+X101965333Y-69526333D01*
+X102060571Y-69573952D01*
+X102251047Y-69573952D01*
+X102346285Y-69621571D01*
+X102393904Y-69669190D01*
+X102441523Y-69764428D01*
+X102441523Y-69954904D01*
+X102393904Y-70050142D01*
+X102346285Y-70097761D01*
+X102251047Y-70145380D01*
+X102060571Y-70145380D01*
+X101965333Y-70097761D01*
+X101917714Y-70050142D01*
+X101870095Y-69954904D01*
+X101870095Y-69764428D01*
+X101917714Y-69669190D01*
+X101965333Y-69621571D01*
+X102060571Y-69573952D01*
 G04 #@! TO.C,C49*
 X100695142Y-89878142D02*
 X100742761Y-89830523D01*
@@ -5761,93 +5860,93 @@ X163021428Y-61858761D02*
 X163259523Y-62573047D01*
 X162640476Y-62573047D01*
 G04 #@! TO.C,D25*
-X181562380Y-69875714D02*
-X180562380Y-69875714D01*
-X180562380Y-70113809D01*
-X180610000Y-70256666D01*
-X180705238Y-70351904D01*
-X180800476Y-70399523D01*
-X180990952Y-70447142D01*
-X181133809Y-70447142D01*
-X181324285Y-70399523D01*
-X181419523Y-70351904D01*
-X181514761Y-70256666D01*
-X181562380Y-70113809D01*
-X181562380Y-69875714D01*
-X180657619Y-70828095D02*
-X180610000Y-70875714D01*
-X180562380Y-70970952D01*
-X180562380Y-71209047D01*
-X180610000Y-71304285D01*
-X180657619Y-71351904D01*
-X180752857Y-71399523D01*
-X180848095Y-71399523D01*
-X180990952Y-71351904D01*
-X181562380Y-70780476D01*
-X181562380Y-71399523D01*
-X180562380Y-72304285D02*
-X180562380Y-71828095D01*
-X181038571Y-71780476D01*
-X180990952Y-71828095D01*
-X180943333Y-71923333D01*
-X180943333Y-72161428D01*
-X180990952Y-72256666D01*
-X181038571Y-72304285D01*
-X181133809Y-72351904D01*
-X181371904Y-72351904D01*
-X181467142Y-72304285D01*
-X181514761Y-72256666D01*
-X181562380Y-72161428D01*
-X181562380Y-71923333D01*
-X181514761Y-71828095D01*
-X181467142Y-71780476D01*
+X181562380Y-69113714D02*
+X180562380Y-69113714D01*
+X180562380Y-69351809D01*
+X180610000Y-69494666D01*
+X180705238Y-69589904D01*
+X180800476Y-69637523D01*
+X180990952Y-69685142D01*
+X181133809Y-69685142D01*
+X181324285Y-69637523D01*
+X181419523Y-69589904D01*
+X181514761Y-69494666D01*
+X181562380Y-69351809D01*
+X181562380Y-69113714D01*
+X180657619Y-70066095D02*
+X180610000Y-70113714D01*
+X180562380Y-70208952D01*
+X180562380Y-70447047D01*
+X180610000Y-70542285D01*
+X180657619Y-70589904D01*
+X180752857Y-70637523D01*
+X180848095Y-70637523D01*
+X180990952Y-70589904D01*
+X181562380Y-70018476D01*
+X181562380Y-70637523D01*
+X180562380Y-71542285D02*
+X180562380Y-71066095D01*
+X181038571Y-71018476D01*
+X180990952Y-71066095D01*
+X180943333Y-71161333D01*
+X180943333Y-71399428D01*
+X180990952Y-71494666D01*
+X181038571Y-71542285D01*
+X181133809Y-71589904D01*
+X181371904Y-71589904D01*
+X181467142Y-71542285D01*
+X181514761Y-71494666D01*
+X181562380Y-71399428D01*
+X181562380Y-71161333D01*
+X181514761Y-71066095D01*
+X181467142Y-71018476D01*
 G04 #@! TO.C,D26*
-X182959380Y-69875714D02*
-X181959380Y-69875714D01*
-X181959380Y-70113809D01*
-X182007000Y-70256666D01*
-X182102238Y-70351904D01*
-X182197476Y-70399523D01*
-X182387952Y-70447142D01*
-X182530809Y-70447142D01*
-X182721285Y-70399523D01*
-X182816523Y-70351904D01*
-X182911761Y-70256666D01*
-X182959380Y-70113809D01*
-X182959380Y-69875714D01*
-X182054619Y-70828095D02*
-X182007000Y-70875714D01*
-X181959380Y-70970952D01*
-X181959380Y-71209047D01*
-X182007000Y-71304285D01*
-X182054619Y-71351904D01*
-X182149857Y-71399523D01*
-X182245095Y-71399523D01*
-X182387952Y-71351904D01*
-X182959380Y-70780476D01*
-X182959380Y-71399523D01*
-X181959380Y-72256666D02*
-X181959380Y-72066190D01*
-X182007000Y-71970952D01*
-X182054619Y-71923333D01*
-X182197476Y-71828095D01*
-X182387952Y-71780476D01*
-X182768904Y-71780476D01*
-X182864142Y-71828095D01*
-X182911761Y-71875714D01*
-X182959380Y-71970952D01*
-X182959380Y-72161428D01*
-X182911761Y-72256666D01*
-X182864142Y-72304285D01*
-X182768904Y-72351904D01*
-X182530809Y-72351904D01*
-X182435571Y-72304285D01*
-X182387952Y-72256666D01*
-X182340333Y-72161428D01*
-X182340333Y-71970952D01*
-X182387952Y-71875714D01*
-X182435571Y-71828095D01*
-X182530809Y-71780476D01*
+X182959380Y-69113714D02*
+X181959380Y-69113714D01*
+X181959380Y-69351809D01*
+X182007000Y-69494666D01*
+X182102238Y-69589904D01*
+X182197476Y-69637523D01*
+X182387952Y-69685142D01*
+X182530809Y-69685142D01*
+X182721285Y-69637523D01*
+X182816523Y-69589904D01*
+X182911761Y-69494666D01*
+X182959380Y-69351809D01*
+X182959380Y-69113714D01*
+X182054619Y-70066095D02*
+X182007000Y-70113714D01*
+X181959380Y-70208952D01*
+X181959380Y-70447047D01*
+X182007000Y-70542285D01*
+X182054619Y-70589904D01*
+X182149857Y-70637523D01*
+X182245095Y-70637523D01*
+X182387952Y-70589904D01*
+X182959380Y-70018476D01*
+X182959380Y-70637523D01*
+X181959380Y-71494666D02*
+X181959380Y-71304190D01*
+X182007000Y-71208952D01*
+X182054619Y-71161333D01*
+X182197476Y-71066095D01*
+X182387952Y-71018476D01*
+X182768904Y-71018476D01*
+X182864142Y-71066095D01*
+X182911761Y-71113714D01*
+X182959380Y-71208952D01*
+X182959380Y-71399428D01*
+X182911761Y-71494666D01*
+X182864142Y-71542285D01*
+X182768904Y-71589904D01*
+X182530809Y-71589904D01*
+X182435571Y-71542285D01*
+X182387952Y-71494666D01*
+X182340333Y-71399428D01*
+X182340333Y-71208952D01*
+X182387952Y-71113714D01*
+X182435571Y-71066095D01*
+X182530809Y-71018476D01*
 G04 #@! TO.C,AE1*
 X184054666Y-113217666D02*
 X183578476Y-113217666D01*
@@ -5960,42 +6059,42 @@ X109537619Y-74288714D01*
 X109490000Y-74336333D01*
 X109442380Y-74431571D01*
 G04 #@! TO.C,R51*
-X154193857Y-72939380D02*
-X154527190Y-72463190D01*
-X154765285Y-72939380D02*
-X154765285Y-71939380D01*
-X154384333Y-71939380D01*
-X154289095Y-71987000D01*
-X154241476Y-72034619D01*
-X154193857Y-72129857D01*
-X154193857Y-72272714D01*
-X154241476Y-72367952D01*
-X154289095Y-72415571D01*
-X154384333Y-72463190D01*
-X154765285Y-72463190D01*
-X153289095Y-71939380D02*
-X153765285Y-71939380D01*
-X153812904Y-72415571D01*
-X153765285Y-72367952D01*
-X153670047Y-72320333D01*
-X153431952Y-72320333D01*
-X153336714Y-72367952D01*
-X153289095Y-72415571D01*
-X153241476Y-72510809D01*
-X153241476Y-72748904D01*
-X153289095Y-72844142D01*
-X153336714Y-72891761D01*
-X153431952Y-72939380D01*
-X153670047Y-72939380D01*
-X153765285Y-72891761D01*
-X153812904Y-72844142D01*
-X152289095Y-72939380D02*
-X152860523Y-72939380D01*
-X152574809Y-72939380D02*
-X152574809Y-71939380D01*
-X152670047Y-72082238D01*
-X152765285Y-72177476D01*
-X152860523Y-72225095D01*
+X156987857Y-71669380D02*
+X157321190Y-71193190D01*
+X157559285Y-71669380D02*
+X157559285Y-70669380D01*
+X157178333Y-70669380D01*
+X157083095Y-70717000D01*
+X157035476Y-70764619D01*
+X156987857Y-70859857D01*
+X156987857Y-71002714D01*
+X157035476Y-71097952D01*
+X157083095Y-71145571D01*
+X157178333Y-71193190D01*
+X157559285Y-71193190D01*
+X156083095Y-70669380D02*
+X156559285Y-70669380D01*
+X156606904Y-71145571D01*
+X156559285Y-71097952D01*
+X156464047Y-71050333D01*
+X156225952Y-71050333D01*
+X156130714Y-71097952D01*
+X156083095Y-71145571D01*
+X156035476Y-71240809D01*
+X156035476Y-71478904D01*
+X156083095Y-71574142D01*
+X156130714Y-71621761D01*
+X156225952Y-71669380D01*
+X156464047Y-71669380D01*
+X156559285Y-71621761D01*
+X156606904Y-71574142D01*
+X155083095Y-71669380D02*
+X155654523Y-71669380D01*
+X155368809Y-71669380D02*
+X155368809Y-70669380D01*
+X155464047Y-70812238D01*
+X155559285Y-70907476D01*
+X155654523Y-70955095D01*
 G04 #@! TO.C,R52*
 X171925380Y-63650142D02*
 X171449190Y-63316809D01*
@@ -6501,31 +6600,6 @@ X135080380Y-95910428D01*
 X135080380Y-95672333D01*
 X135032761Y-95577095D01*
 X134985142Y-95529476D01*
-G04 #@! TO.C,U11*
-X145899095Y-61906380D02*
-X145899095Y-62715904D01*
-X145851476Y-62811142D01*
-X145803857Y-62858761D01*
-X145708619Y-62906380D01*
-X145518142Y-62906380D01*
-X145422904Y-62858761D01*
-X145375285Y-62811142D01*
-X145327666Y-62715904D01*
-X145327666Y-61906380D01*
-X144327666Y-62906380D02*
-X144899095Y-62906380D01*
-X144613380Y-62906380D02*
-X144613380Y-61906380D01*
-X144708619Y-62049238D01*
-X144803857Y-62144476D01*
-X144899095Y-62192095D01*
-X143375285Y-62906380D02*
-X143946714Y-62906380D01*
-X143661000Y-62906380D02*
-X143661000Y-61906380D01*
-X143756238Y-62049238D01*
-X143851476Y-62144476D01*
-X143946714Y-62192095D01*
 G04 #@! TO.C,C55*
 X180959142Y-91275142D02*
 X181006761Y-91227523D01*
@@ -6628,49 +6702,49 @@ X177752380Y-89957333D01*
 X177704761Y-89862095D01*
 X177657142Y-89814476D01*
 G04 #@! TO.C,L1*
-X159036666Y-86042380D02*
-X159512857Y-86042380D01*
-X159512857Y-85042380D01*
-X158179523Y-86042380D02*
-X158750952Y-86042380D01*
-X158465238Y-86042380D02*
-X158465238Y-85042380D01*
-X158560476Y-85185238D01*
-X158655714Y-85280476D01*
-X158750952Y-85328095D01*
+X162099666Y-88560380D02*
+X162575857Y-88560380D01*
+X162575857Y-87560380D01*
+X161242523Y-88560380D02*
+X161813952Y-88560380D01*
+X161528238Y-88560380D02*
+X161528238Y-87560380D01*
+X161623476Y-87703238D01*
+X161718714Y-87798476D01*
+X161813952Y-87846095D01*
 G04 #@! TO.C,L2*
-X101901666Y-88560380D02*
-X102377857Y-88560380D01*
-X102377857Y-87560380D01*
-X101615952Y-87655619D02*
-X101568333Y-87608000D01*
-X101473095Y-87560380D01*
-X101235000Y-87560380D01*
-X101139761Y-87608000D01*
-X101092142Y-87655619D01*
-X101044523Y-87750857D01*
-X101044523Y-87846095D01*
-X101092142Y-87988952D01*
-X101663571Y-88560380D01*
-X101044523Y-88560380D01*
+X101774666Y-88941380D02*
+X102250857Y-88941380D01*
+X102250857Y-87941380D01*
+X101488952Y-88036619D02*
+X101441333Y-87989000D01*
+X101346095Y-87941380D01*
+X101108000Y-87941380D01*
+X101012761Y-87989000D01*
+X100965142Y-88036619D01*
+X100917523Y-88131857D01*
+X100917523Y-88227095D01*
+X100965142Y-88369952D01*
+X101536571Y-88941380D01*
+X100917523Y-88941380D01*
 G04 #@! TO.C,L3*
-X153209666Y-75225380D02*
-X153685857Y-75225380D01*
-X153685857Y-74225380D01*
-X152971571Y-74225380D02*
-X152352523Y-74225380D01*
-X152685857Y-74606333D01*
-X152543000Y-74606333D01*
-X152447761Y-74653952D01*
-X152400142Y-74701571D01*
-X152352523Y-74796809D01*
-X152352523Y-75034904D01*
-X152400142Y-75130142D01*
-X152447761Y-75177761D01*
-X152543000Y-75225380D01*
-X152828714Y-75225380D01*
-X152923952Y-75177761D01*
-X152971571Y-75130142D01*
+X159559666Y-75225380D02*
+X160035857Y-75225380D01*
+X160035857Y-74225380D01*
+X159321571Y-74225380D02*
+X158702523Y-74225380D01*
+X159035857Y-74606333D01*
+X158893000Y-74606333D01*
+X158797761Y-74653952D01*
+X158750142Y-74701571D01*
+X158702523Y-74796809D01*
+X158702523Y-75034904D01*
+X158750142Y-75130142D01*
+X158797761Y-75177761D01*
+X158893000Y-75225380D01*
+X159178714Y-75225380D01*
+X159273952Y-75177761D01*
+X159321571Y-75130142D01*
 G04 #@! TO.C,R1*
 X172767666Y-82845380D02*
 X173101000Y-82369190D01*
@@ -6718,118 +6792,118 @@ X174005952Y-80573095D01*
 X174577380Y-80001666D01*
 X174577380Y-80620714D01*
 G04 #@! TO.C,R3*
-X160575666Y-70780380D02*
-X160909000Y-70304190D01*
-X161147095Y-70780380D02*
-X161147095Y-69780380D01*
-X160766142Y-69780380D01*
-X160670904Y-69828000D01*
-X160623285Y-69875619D01*
-X160575666Y-69970857D01*
-X160575666Y-70113714D01*
-X160623285Y-70208952D01*
-X160670904Y-70256571D01*
-X160766142Y-70304190D01*
-X161147095Y-70304190D01*
-X160242333Y-69780380D02*
-X159623285Y-69780380D01*
-X159956619Y-70161333D01*
-X159813761Y-70161333D01*
-X159718523Y-70208952D01*
-X159670904Y-70256571D01*
-X159623285Y-70351809D01*
-X159623285Y-70589904D01*
-X159670904Y-70685142D01*
-X159718523Y-70732761D01*
-X159813761Y-70780380D01*
-X160099476Y-70780380D01*
-X160194714Y-70732761D01*
-X160242333Y-70685142D01*
+X161115380Y-70161333D02*
+X160639190Y-69828000D01*
+X161115380Y-69589904D02*
+X160115380Y-69589904D01*
+X160115380Y-69970857D01*
+X160163000Y-70066095D01*
+X160210619Y-70113714D01*
+X160305857Y-70161333D01*
+X160448714Y-70161333D01*
+X160543952Y-70113714D01*
+X160591571Y-70066095D01*
+X160639190Y-69970857D01*
+X160639190Y-69589904D01*
+X160115380Y-70494666D02*
+X160115380Y-71113714D01*
+X160496333Y-70780380D01*
+X160496333Y-70923238D01*
+X160543952Y-71018476D01*
+X160591571Y-71066095D01*
+X160686809Y-71113714D01*
+X160924904Y-71113714D01*
+X161020142Y-71066095D01*
+X161067761Y-71018476D01*
+X161115380Y-70923238D01*
+X161115380Y-70637523D01*
+X161067761Y-70542285D01*
+X161020142Y-70494666D01*
 G04 #@! TO.C,R4*
-X181657666Y-80686380D02*
-X181991000Y-80210190D01*
-X182229095Y-80686380D02*
-X182229095Y-79686380D01*
-X181848142Y-79686380D01*
-X181752904Y-79734000D01*
-X181705285Y-79781619D01*
-X181657666Y-79876857D01*
-X181657666Y-80019714D01*
-X181705285Y-80114952D01*
-X181752904Y-80162571D01*
-X181848142Y-80210190D01*
-X182229095Y-80210190D01*
-X180800523Y-80019714D02*
-X180800523Y-80686380D01*
-X181038619Y-79638761D02*
-X181276714Y-80353047D01*
-X180657666Y-80353047D01*
+X176196666Y-82210380D02*
+X176530000Y-81734190D01*
+X176768095Y-82210380D02*
+X176768095Y-81210380D01*
+X176387142Y-81210380D01*
+X176291904Y-81258000D01*
+X176244285Y-81305619D01*
+X176196666Y-81400857D01*
+X176196666Y-81543714D01*
+X176244285Y-81638952D01*
+X176291904Y-81686571D01*
+X176387142Y-81734190D01*
+X176768095Y-81734190D01*
+X175339523Y-81543714D02*
+X175339523Y-82210380D01*
+X175577619Y-81162761D02*
+X175815714Y-81877047D01*
+X175196666Y-81877047D01*
 G04 #@! TO.C,R5*
-X166576380Y-76130333D02*
-X166100190Y-75797000D01*
-X166576380Y-75558904D02*
-X165576380Y-75558904D01*
-X165576380Y-75939857D01*
-X165624000Y-76035095D01*
-X165671619Y-76082714D01*
-X165766857Y-76130333D01*
-X165909714Y-76130333D01*
-X166004952Y-76082714D01*
-X166052571Y-76035095D01*
-X166100190Y-75939857D01*
-X166100190Y-75558904D01*
-X165576380Y-77035095D02*
-X165576380Y-76558904D01*
-X166052571Y-76511285D01*
-X166004952Y-76558904D01*
-X165957333Y-76654142D01*
-X165957333Y-76892238D01*
-X166004952Y-76987476D01*
-X166052571Y-77035095D01*
-X166147809Y-77082714D01*
-X166385904Y-77082714D01*
-X166481142Y-77035095D01*
-X166528761Y-76987476D01*
-X166576380Y-76892238D01*
-X166576380Y-76654142D01*
-X166528761Y-76558904D01*
-X166481142Y-76511285D01*
+X167465380Y-75876333D02*
+X166989190Y-75543000D01*
+X167465380Y-75304904D02*
+X166465380Y-75304904D01*
+X166465380Y-75685857D01*
+X166513000Y-75781095D01*
+X166560619Y-75828714D01*
+X166655857Y-75876333D01*
+X166798714Y-75876333D01*
+X166893952Y-75828714D01*
+X166941571Y-75781095D01*
+X166989190Y-75685857D01*
+X166989190Y-75304904D01*
+X166465380Y-76781095D02*
+X166465380Y-76304904D01*
+X166941571Y-76257285D01*
+X166893952Y-76304904D01*
+X166846333Y-76400142D01*
+X166846333Y-76638238D01*
+X166893952Y-76733476D01*
+X166941571Y-76781095D01*
+X167036809Y-76828714D01*
+X167274904Y-76828714D01*
+X167370142Y-76781095D01*
+X167417761Y-76733476D01*
+X167465380Y-76638238D01*
+X167465380Y-76400142D01*
+X167417761Y-76304904D01*
+X167370142Y-76257285D01*
 G04 #@! TO.C,R6*
-X179022380Y-87052333D02*
-X178546190Y-86719000D01*
-X179022380Y-86480904D02*
-X178022380Y-86480904D01*
-X178022380Y-86861857D01*
-X178070000Y-86957095D01*
-X178117619Y-87004714D01*
-X178212857Y-87052333D01*
-X178355714Y-87052333D01*
-X178450952Y-87004714D01*
-X178498571Y-86957095D01*
-X178546190Y-86861857D01*
-X178546190Y-86480904D01*
-X178022380Y-87909476D02*
-X178022380Y-87719000D01*
-X178070000Y-87623761D01*
-X178117619Y-87576142D01*
-X178260476Y-87480904D01*
-X178450952Y-87433285D01*
-X178831904Y-87433285D01*
-X178927142Y-87480904D01*
-X178974761Y-87528523D01*
-X179022380Y-87623761D01*
-X179022380Y-87814238D01*
-X178974761Y-87909476D01*
-X178927142Y-87957095D01*
-X178831904Y-88004714D01*
-X178593809Y-88004714D01*
-X178498571Y-87957095D01*
-X178450952Y-87909476D01*
-X178403333Y-87814238D01*
-X178403333Y-87623761D01*
-X178450952Y-87528523D01*
-X178498571Y-87480904D01*
-X178593809Y-87433285D01*
+X180292380Y-84766333D02*
+X179816190Y-84433000D01*
+X180292380Y-84194904D02*
+X179292380Y-84194904D01*
+X179292380Y-84575857D01*
+X179340000Y-84671095D01*
+X179387619Y-84718714D01*
+X179482857Y-84766333D01*
+X179625714Y-84766333D01*
+X179720952Y-84718714D01*
+X179768571Y-84671095D01*
+X179816190Y-84575857D01*
+X179816190Y-84194904D01*
+X179292380Y-85623476D02*
+X179292380Y-85433000D01*
+X179340000Y-85337761D01*
+X179387619Y-85290142D01*
+X179530476Y-85194904D01*
+X179720952Y-85147285D01*
+X180101904Y-85147285D01*
+X180197142Y-85194904D01*
+X180244761Y-85242523D01*
+X180292380Y-85337761D01*
+X180292380Y-85528238D01*
+X180244761Y-85623476D01*
+X180197142Y-85671095D01*
+X180101904Y-85718714D01*
+X179863809Y-85718714D01*
+X179768571Y-85671095D01*
+X179720952Y-85623476D01*
+X179673333Y-85528238D01*
+X179673333Y-85337761D01*
+X179720952Y-85242523D01*
+X179768571Y-85194904D01*
+X179863809Y-85147285D01*
 G04 #@! TO.C,R7*
 X113998380Y-78797333D02*
 X113522190Y-78464000D01*
@@ -7861,142 +7935,142 @@ X131397380Y-95624714D01*
 X131349761Y-95529476D01*
 X131302142Y-95481857D01*
 G04 #@! TO.C,R34*
-X100853857Y-104054380D02*
-X101187190Y-103578190D01*
-X101425285Y-104054380D02*
-X101425285Y-103054380D01*
-X101044333Y-103054380D01*
-X100949095Y-103102000D01*
-X100901476Y-103149619D01*
-X100853857Y-103244857D01*
-X100853857Y-103387714D01*
-X100901476Y-103482952D01*
-X100949095Y-103530571D01*
-X101044333Y-103578190D01*
-X101425285Y-103578190D01*
-X100520523Y-103054380D02*
-X99901476Y-103054380D01*
-X100234809Y-103435333D01*
-X100091952Y-103435333D01*
-X99996714Y-103482952D01*
-X99949095Y-103530571D01*
-X99901476Y-103625809D01*
-X99901476Y-103863904D01*
-X99949095Y-103959142D01*
-X99996714Y-104006761D01*
-X100091952Y-104054380D01*
-X100377666Y-104054380D01*
-X100472904Y-104006761D01*
-X100520523Y-103959142D01*
-X99044333Y-103387714D02*
-X99044333Y-104054380D01*
-X99282428Y-103006761D02*
-X99520523Y-103721047D01*
-X98901476Y-103721047D01*
+X100853857Y-104308380D02*
+X101187190Y-103832190D01*
+X101425285Y-104308380D02*
+X101425285Y-103308380D01*
+X101044333Y-103308380D01*
+X100949095Y-103356000D01*
+X100901476Y-103403619D01*
+X100853857Y-103498857D01*
+X100853857Y-103641714D01*
+X100901476Y-103736952D01*
+X100949095Y-103784571D01*
+X101044333Y-103832190D01*
+X101425285Y-103832190D01*
+X100520523Y-103308380D02*
+X99901476Y-103308380D01*
+X100234809Y-103689333D01*
+X100091952Y-103689333D01*
+X99996714Y-103736952D01*
+X99949095Y-103784571D01*
+X99901476Y-103879809D01*
+X99901476Y-104117904D01*
+X99949095Y-104213142D01*
+X99996714Y-104260761D01*
+X100091952Y-104308380D01*
+X100377666Y-104308380D01*
+X100472904Y-104260761D01*
+X100520523Y-104213142D01*
+X99044333Y-103641714D02*
+X99044333Y-104308380D01*
+X99282428Y-103260761D02*
+X99520523Y-103975047D01*
+X98901476Y-103975047D01*
 G04 #@! TO.C,R35*
-X100853857Y-102530380D02*
-X101187190Y-102054190D01*
-X101425285Y-102530380D02*
-X101425285Y-101530380D01*
-X101044333Y-101530380D01*
-X100949095Y-101578000D01*
-X100901476Y-101625619D01*
-X100853857Y-101720857D01*
-X100853857Y-101863714D01*
-X100901476Y-101958952D01*
-X100949095Y-102006571D01*
-X101044333Y-102054190D01*
-X101425285Y-102054190D01*
-X100520523Y-101530380D02*
-X99901476Y-101530380D01*
-X100234809Y-101911333D01*
-X100091952Y-101911333D01*
-X99996714Y-101958952D01*
-X99949095Y-102006571D01*
-X99901476Y-102101809D01*
-X99901476Y-102339904D01*
-X99949095Y-102435142D01*
-X99996714Y-102482761D01*
-X100091952Y-102530380D01*
-X100377666Y-102530380D01*
-X100472904Y-102482761D01*
-X100520523Y-102435142D01*
-X98996714Y-101530380D02*
-X99472904Y-101530380D01*
-X99520523Y-102006571D01*
-X99472904Y-101958952D01*
-X99377666Y-101911333D01*
-X99139571Y-101911333D01*
-X99044333Y-101958952D01*
-X98996714Y-102006571D01*
-X98949095Y-102101809D01*
-X98949095Y-102339904D01*
-X98996714Y-102435142D01*
-X99044333Y-102482761D01*
-X99139571Y-102530380D01*
-X99377666Y-102530380D01*
-X99472904Y-102482761D01*
-X99520523Y-102435142D01*
+X100853857Y-102784380D02*
+X101187190Y-102308190D01*
+X101425285Y-102784380D02*
+X101425285Y-101784380D01*
+X101044333Y-101784380D01*
+X100949095Y-101832000D01*
+X100901476Y-101879619D01*
+X100853857Y-101974857D01*
+X100853857Y-102117714D01*
+X100901476Y-102212952D01*
+X100949095Y-102260571D01*
+X101044333Y-102308190D01*
+X101425285Y-102308190D01*
+X100520523Y-101784380D02*
+X99901476Y-101784380D01*
+X100234809Y-102165333D01*
+X100091952Y-102165333D01*
+X99996714Y-102212952D01*
+X99949095Y-102260571D01*
+X99901476Y-102355809D01*
+X99901476Y-102593904D01*
+X99949095Y-102689142D01*
+X99996714Y-102736761D01*
+X100091952Y-102784380D01*
+X100377666Y-102784380D01*
+X100472904Y-102736761D01*
+X100520523Y-102689142D01*
+X98996714Y-101784380D02*
+X99472904Y-101784380D01*
+X99520523Y-102260571D01*
+X99472904Y-102212952D01*
+X99377666Y-102165333D01*
+X99139571Y-102165333D01*
+X99044333Y-102212952D01*
+X98996714Y-102260571D01*
+X98949095Y-102355809D01*
+X98949095Y-102593904D01*
+X98996714Y-102689142D01*
+X99044333Y-102736761D01*
+X99139571Y-102784380D01*
+X99377666Y-102784380D01*
+X99472904Y-102736761D01*
+X99520523Y-102689142D01*
 G04 #@! TO.C,R38*
-X105504380Y-101834142D02*
-X105028190Y-101500809D01*
-X105504380Y-101262714D02*
-X104504380Y-101262714D01*
-X104504380Y-101643666D01*
-X104552000Y-101738904D01*
-X104599619Y-101786523D01*
-X104694857Y-101834142D01*
-X104837714Y-101834142D01*
-X104932952Y-101786523D01*
-X104980571Y-101738904D01*
-X105028190Y-101643666D01*
-X105028190Y-101262714D01*
-X104504380Y-102167476D02*
-X104504380Y-102786523D01*
-X104885333Y-102453190D01*
-X104885333Y-102596047D01*
-X104932952Y-102691285D01*
-X104980571Y-102738904D01*
-X105075809Y-102786523D01*
-X105313904Y-102786523D01*
-X105409142Y-102738904D01*
-X105456761Y-102691285D01*
-X105504380Y-102596047D01*
-X105504380Y-102310333D01*
-X105456761Y-102215095D01*
-X105409142Y-102167476D01*
-X104932952Y-103357952D02*
-X104885333Y-103262714D01*
-X104837714Y-103215095D01*
-X104742476Y-103167476D01*
-X104694857Y-103167476D01*
-X104599619Y-103215095D01*
-X104552000Y-103262714D01*
-X104504380Y-103357952D01*
-X104504380Y-103548428D01*
-X104552000Y-103643666D01*
-X104599619Y-103691285D01*
-X104694857Y-103738904D01*
-X104742476Y-103738904D01*
-X104837714Y-103691285D01*
-X104885333Y-103643666D01*
-X104932952Y-103548428D01*
-X104932952Y-103357952D01*
-X104980571Y-103262714D01*
-X105028190Y-103215095D01*
-X105123428Y-103167476D01*
-X105313904Y-103167476D01*
-X105409142Y-103215095D01*
-X105456761Y-103262714D01*
-X105504380Y-103357952D01*
-X105504380Y-103548428D01*
-X105456761Y-103643666D01*
-X105409142Y-103691285D01*
-X105313904Y-103738904D01*
-X105123428Y-103738904D01*
-X105028190Y-103691285D01*
-X104980571Y-103643666D01*
-X104932952Y-103548428D01*
+X102695380Y-98387142D02*
+X102219190Y-98053809D01*
+X102695380Y-97815714D02*
+X101695380Y-97815714D01*
+X101695380Y-98196666D01*
+X101743000Y-98291904D01*
+X101790619Y-98339523D01*
+X101885857Y-98387142D01*
+X102028714Y-98387142D01*
+X102123952Y-98339523D01*
+X102171571Y-98291904D01*
+X102219190Y-98196666D01*
+X102219190Y-97815714D01*
+X101695380Y-98720476D02*
+X101695380Y-99339523D01*
+X102076333Y-99006190D01*
+X102076333Y-99149047D01*
+X102123952Y-99244285D01*
+X102171571Y-99291904D01*
+X102266809Y-99339523D01*
+X102504904Y-99339523D01*
+X102600142Y-99291904D01*
+X102647761Y-99244285D01*
+X102695380Y-99149047D01*
+X102695380Y-98863333D01*
+X102647761Y-98768095D01*
+X102600142Y-98720476D01*
+X102123952Y-99910952D02*
+X102076333Y-99815714D01*
+X102028714Y-99768095D01*
+X101933476Y-99720476D01*
+X101885857Y-99720476D01*
+X101790619Y-99768095D01*
+X101743000Y-99815714D01*
+X101695380Y-99910952D01*
+X101695380Y-100101428D01*
+X101743000Y-100196666D01*
+X101790619Y-100244285D01*
+X101885857Y-100291904D01*
+X101933476Y-100291904D01*
+X102028714Y-100244285D01*
+X102076333Y-100196666D01*
+X102123952Y-100101428D01*
+X102123952Y-99910952D01*
+X102171571Y-99815714D01*
+X102219190Y-99768095D01*
+X102314428Y-99720476D01*
+X102504904Y-99720476D01*
+X102600142Y-99768095D01*
+X102647761Y-99815714D01*
+X102695380Y-99910952D01*
+X102695380Y-100101428D01*
+X102647761Y-100196666D01*
+X102600142Y-100244285D01*
+X102504904Y-100291904D01*
+X102314428Y-100291904D01*
+X102219190Y-100244285D01*
+X102171571Y-100196666D01*
+X102123952Y-100101428D01*
 G04 #@! TO.C,R39*
 X163957857Y-95147380D02*
 X164291190Y-94671190D01*
@@ -8359,158 +8433,158 @@ X155781380Y-82186523D01*
 X155733761Y-82091285D01*
 X155686142Y-82043666D01*
 G04 #@! TO.C,RD9*
-X162218666Y-74082380D02*
-X162552000Y-73606190D01*
-X162790095Y-74082380D02*
-X162790095Y-73082380D01*
-X162409142Y-73082380D01*
-X162313904Y-73130000D01*
-X162266285Y-73177619D01*
-X162218666Y-73272857D01*
-X162218666Y-73415714D01*
-X162266285Y-73510952D01*
-X162313904Y-73558571D01*
-X162409142Y-73606190D01*
-X162790095Y-73606190D01*
-X161790095Y-74082380D02*
-X161790095Y-73082380D01*
-X161552000Y-73082380D01*
-X161409142Y-73130000D01*
-X161313904Y-73225238D01*
-X161266285Y-73320476D01*
-X161218666Y-73510952D01*
-X161218666Y-73653809D01*
-X161266285Y-73844285D01*
-X161313904Y-73939523D01*
-X161409142Y-74034761D01*
-X161552000Y-74082380D01*
-X161790095Y-74082380D01*
-X160742476Y-74082380D02*
-X160552000Y-74082380D01*
-X160456761Y-74034761D01*
-X160409142Y-73987142D01*
-X160313904Y-73844285D01*
-X160266285Y-73653809D01*
-X160266285Y-73272857D01*
-X160313904Y-73177619D01*
-X160361523Y-73130000D01*
-X160456761Y-73082380D01*
-X160647238Y-73082380D01*
-X160742476Y-73130000D01*
-X160790095Y-73177619D01*
-X160837714Y-73272857D01*
-X160837714Y-73510952D01*
-X160790095Y-73606190D01*
-X160742476Y-73653809D01*
-X160647238Y-73701428D01*
-X160456761Y-73701428D01*
-X160361523Y-73653809D01*
-X160313904Y-73606190D01*
-X160266285Y-73510952D01*
+X165393666Y-75606380D02*
+X165727000Y-75130190D01*
+X165965095Y-75606380D02*
+X165965095Y-74606380D01*
+X165584142Y-74606380D01*
+X165488904Y-74654000D01*
+X165441285Y-74701619D01*
+X165393666Y-74796857D01*
+X165393666Y-74939714D01*
+X165441285Y-75034952D01*
+X165488904Y-75082571D01*
+X165584142Y-75130190D01*
+X165965095Y-75130190D01*
+X164965095Y-75606380D02*
+X164965095Y-74606380D01*
+X164727000Y-74606380D01*
+X164584142Y-74654000D01*
+X164488904Y-74749238D01*
+X164441285Y-74844476D01*
+X164393666Y-75034952D01*
+X164393666Y-75177809D01*
+X164441285Y-75368285D01*
+X164488904Y-75463523D01*
+X164584142Y-75558761D01*
+X164727000Y-75606380D01*
+X164965095Y-75606380D01*
+X163917476Y-75606380D02*
+X163727000Y-75606380D01*
+X163631761Y-75558761D01*
+X163584142Y-75511142D01*
+X163488904Y-75368285D01*
+X163441285Y-75177809D01*
+X163441285Y-74796857D01*
+X163488904Y-74701619D01*
+X163536523Y-74654000D01*
+X163631761Y-74606380D01*
+X163822238Y-74606380D01*
+X163917476Y-74654000D01*
+X163965095Y-74701619D01*
+X164012714Y-74796857D01*
+X164012714Y-75034952D01*
+X163965095Y-75130190D01*
+X163917476Y-75177809D01*
+X163822238Y-75225428D01*
+X163631761Y-75225428D01*
+X163536523Y-75177809D01*
+X163488904Y-75130190D01*
+X163441285Y-75034952D01*
 G04 #@! TO.C,RD51*
-X157812380Y-65375142D02*
-X157336190Y-65041809D01*
-X157812380Y-64803714D02*
-X156812380Y-64803714D01*
-X156812380Y-65184666D01*
-X156860000Y-65279904D01*
-X156907619Y-65327523D01*
-X157002857Y-65375142D01*
-X157145714Y-65375142D01*
-X157240952Y-65327523D01*
-X157288571Y-65279904D01*
-X157336190Y-65184666D01*
-X157336190Y-64803714D01*
-X157812380Y-65803714D02*
-X156812380Y-65803714D01*
-X156812380Y-66041809D01*
-X156860000Y-66184666D01*
-X156955238Y-66279904D01*
-X157050476Y-66327523D01*
-X157240952Y-66375142D01*
-X157383809Y-66375142D01*
-X157574285Y-66327523D01*
-X157669523Y-66279904D01*
-X157764761Y-66184666D01*
-X157812380Y-66041809D01*
-X157812380Y-65803714D01*
-X156812380Y-67279904D02*
-X156812380Y-66803714D01*
-X157288571Y-66756095D01*
-X157240952Y-66803714D01*
-X157193333Y-66898952D01*
-X157193333Y-67137047D01*
-X157240952Y-67232285D01*
-X157288571Y-67279904D01*
-X157383809Y-67327523D01*
-X157621904Y-67327523D01*
-X157717142Y-67279904D01*
-X157764761Y-67232285D01*
-X157812380Y-67137047D01*
-X157812380Y-66898952D01*
-X157764761Y-66803714D01*
-X157717142Y-66756095D01*
-X157812380Y-68279904D02*
-X157812380Y-67708476D01*
-X157812380Y-67994190D02*
-X156812380Y-67994190D01*
-X156955238Y-67898952D01*
-X157050476Y-67803714D01*
-X157098095Y-67708476D01*
+X157686380Y-65248142D02*
+X157210190Y-64914809D01*
+X157686380Y-64676714D02*
+X156686380Y-64676714D01*
+X156686380Y-65057666D01*
+X156734000Y-65152904D01*
+X156781619Y-65200523D01*
+X156876857Y-65248142D01*
+X157019714Y-65248142D01*
+X157114952Y-65200523D01*
+X157162571Y-65152904D01*
+X157210190Y-65057666D01*
+X157210190Y-64676714D01*
+X157686380Y-65676714D02*
+X156686380Y-65676714D01*
+X156686380Y-65914809D01*
+X156734000Y-66057666D01*
+X156829238Y-66152904D01*
+X156924476Y-66200523D01*
+X157114952Y-66248142D01*
+X157257809Y-66248142D01*
+X157448285Y-66200523D01*
+X157543523Y-66152904D01*
+X157638761Y-66057666D01*
+X157686380Y-65914809D01*
+X157686380Y-65676714D01*
+X156686380Y-67152904D02*
+X156686380Y-66676714D01*
+X157162571Y-66629095D01*
+X157114952Y-66676714D01*
+X157067333Y-66771952D01*
+X157067333Y-67010047D01*
+X157114952Y-67105285D01*
+X157162571Y-67152904D01*
+X157257809Y-67200523D01*
+X157495904Y-67200523D01*
+X157591142Y-67152904D01*
+X157638761Y-67105285D01*
+X157686380Y-67010047D01*
+X157686380Y-66771952D01*
+X157638761Y-66676714D01*
+X157591142Y-66629095D01*
+X157686380Y-68152904D02*
+X157686380Y-67581476D01*
+X157686380Y-67867190D02*
+X156686380Y-67867190D01*
+X156829238Y-67771952D01*
+X156924476Y-67676714D01*
+X156972095Y-67581476D01*
 G04 #@! TO.C,RD52*
-X158957380Y-65248142D02*
-X158481190Y-64914809D01*
-X158957380Y-64676714D02*
-X157957380Y-64676714D01*
-X157957380Y-65057666D01*
-X158005000Y-65152904D01*
-X158052619Y-65200523D01*
-X158147857Y-65248142D01*
-X158290714Y-65248142D01*
-X158385952Y-65200523D01*
-X158433571Y-65152904D01*
-X158481190Y-65057666D01*
-X158481190Y-64676714D01*
-X158957380Y-65676714D02*
-X157957380Y-65676714D01*
-X157957380Y-65914809D01*
-X158005000Y-66057666D01*
-X158100238Y-66152904D01*
-X158195476Y-66200523D01*
-X158385952Y-66248142D01*
-X158528809Y-66248142D01*
-X158719285Y-66200523D01*
-X158814523Y-66152904D01*
-X158909761Y-66057666D01*
-X158957380Y-65914809D01*
-X158957380Y-65676714D01*
-X157957380Y-67152904D02*
-X157957380Y-66676714D01*
-X158433571Y-66629095D01*
-X158385952Y-66676714D01*
-X158338333Y-66771952D01*
-X158338333Y-67010047D01*
-X158385952Y-67105285D01*
-X158433571Y-67152904D01*
-X158528809Y-67200523D01*
-X158766904Y-67200523D01*
-X158862142Y-67152904D01*
-X158909761Y-67105285D01*
-X158957380Y-67010047D01*
-X158957380Y-66771952D01*
-X158909761Y-66676714D01*
-X158862142Y-66629095D01*
-X158052619Y-67581476D02*
-X158005000Y-67629095D01*
-X157957380Y-67724333D01*
-X157957380Y-67962428D01*
-X158005000Y-68057666D01*
-X158052619Y-68105285D01*
-X158147857Y-68152904D01*
-X158243095Y-68152904D01*
-X158385952Y-68105285D01*
-X158957380Y-67533857D01*
-X158957380Y-68152904D01*
+X159083380Y-65248142D02*
+X158607190Y-64914809D01*
+X159083380Y-64676714D02*
+X158083380Y-64676714D01*
+X158083380Y-65057666D01*
+X158131000Y-65152904D01*
+X158178619Y-65200523D01*
+X158273857Y-65248142D01*
+X158416714Y-65248142D01*
+X158511952Y-65200523D01*
+X158559571Y-65152904D01*
+X158607190Y-65057666D01*
+X158607190Y-64676714D01*
+X159083380Y-65676714D02*
+X158083380Y-65676714D01*
+X158083380Y-65914809D01*
+X158131000Y-66057666D01*
+X158226238Y-66152904D01*
+X158321476Y-66200523D01*
+X158511952Y-66248142D01*
+X158654809Y-66248142D01*
+X158845285Y-66200523D01*
+X158940523Y-66152904D01*
+X159035761Y-66057666D01*
+X159083380Y-65914809D01*
+X159083380Y-65676714D01*
+X158083380Y-67152904D02*
+X158083380Y-66676714D01*
+X158559571Y-66629095D01*
+X158511952Y-66676714D01*
+X158464333Y-66771952D01*
+X158464333Y-67010047D01*
+X158511952Y-67105285D01*
+X158559571Y-67152904D01*
+X158654809Y-67200523D01*
+X158892904Y-67200523D01*
+X158988142Y-67152904D01*
+X159035761Y-67105285D01*
+X159083380Y-67010047D01*
+X159083380Y-66771952D01*
+X159035761Y-66676714D01*
+X158988142Y-66629095D01*
+X158178619Y-67581476D02*
+X158131000Y-67629095D01*
+X158083380Y-67724333D01*
+X158083380Y-67962428D01*
+X158131000Y-68057666D01*
+X158178619Y-68105285D01*
+X158273857Y-68152904D01*
+X158369095Y-68152904D01*
+X158511952Y-68105285D01*
+X159083380Y-67533857D01*
+X159083380Y-68152904D01*
 G04 #@! TO.C,RP1*
 X151083380Y-96694333D02*
 X150607190Y-96361000D01*
@@ -8619,82 +8693,82 @@ X146510380Y-79120523D01*
 X146462761Y-79025285D01*
 X146415142Y-78977666D01*
 G04 #@! TO.C,D8*
-X112887095Y-73026380D02*
-X112887095Y-72026380D01*
-X112649000Y-72026380D01*
-X112506142Y-72074000D01*
-X112410904Y-72169238D01*
-X112363285Y-72264476D01*
-X112315666Y-72454952D01*
-X112315666Y-72597809D01*
-X112363285Y-72788285D01*
-X112410904Y-72883523D01*
-X112506142Y-72978761D01*
-X112649000Y-73026380D01*
-X112887095Y-73026380D01*
-X111744238Y-72454952D02*
-X111839476Y-72407333D01*
-X111887095Y-72359714D01*
-X111934714Y-72264476D01*
-X111934714Y-72216857D01*
-X111887095Y-72121619D01*
-X111839476Y-72074000D01*
-X111744238Y-72026380D01*
-X111553761Y-72026380D01*
-X111458523Y-72074000D01*
-X111410904Y-72121619D01*
-X111363285Y-72216857D01*
-X111363285Y-72264476D01*
-X111410904Y-72359714D01*
-X111458523Y-72407333D01*
-X111553761Y-72454952D01*
-X111744238Y-72454952D01*
-X111839476Y-72502571D01*
-X111887095Y-72550190D01*
-X111934714Y-72645428D01*
-X111934714Y-72835904D01*
-X111887095Y-72931142D01*
-X111839476Y-72978761D01*
-X111744238Y-73026380D01*
-X111553761Y-73026380D01*
-X111458523Y-72978761D01*
-X111410904Y-72931142D01*
-X111363285Y-72835904D01*
-X111363285Y-72645428D01*
-X111410904Y-72550190D01*
-X111458523Y-72502571D01*
-X111553761Y-72454952D01*
+X108188095Y-72812380D02*
+X108188095Y-71812380D01*
+X107950000Y-71812380D01*
+X107807142Y-71860000D01*
+X107711904Y-71955238D01*
+X107664285Y-72050476D01*
+X107616666Y-72240952D01*
+X107616666Y-72383809D01*
+X107664285Y-72574285D01*
+X107711904Y-72669523D01*
+X107807142Y-72764761D01*
+X107950000Y-72812380D01*
+X108188095Y-72812380D01*
+X107045238Y-72240952D02*
+X107140476Y-72193333D01*
+X107188095Y-72145714D01*
+X107235714Y-72050476D01*
+X107235714Y-72002857D01*
+X107188095Y-71907619D01*
+X107140476Y-71860000D01*
+X107045238Y-71812380D01*
+X106854761Y-71812380D01*
+X106759523Y-71860000D01*
+X106711904Y-71907619D01*
+X106664285Y-72002857D01*
+X106664285Y-72050476D01*
+X106711904Y-72145714D01*
+X106759523Y-72193333D01*
+X106854761Y-72240952D01*
+X107045238Y-72240952D01*
+X107140476Y-72288571D01*
+X107188095Y-72336190D01*
+X107235714Y-72431428D01*
+X107235714Y-72621904D01*
+X107188095Y-72717142D01*
+X107140476Y-72764761D01*
+X107045238Y-72812380D01*
+X106854761Y-72812380D01*
+X106759523Y-72764761D01*
+X106711904Y-72717142D01*
+X106664285Y-72621904D01*
+X106664285Y-72431428D01*
+X106711904Y-72336190D01*
+X106759523Y-72288571D01*
+X106854761Y-72240952D01*
 G04 #@! TO.C,Q1*
-X179062619Y-84184761D02*
-X179015000Y-84089523D01*
-X178919761Y-83994285D01*
-X178776904Y-83851428D01*
-X178729285Y-83756190D01*
-X178729285Y-83660952D01*
-X178967380Y-83708571D02*
-X178919761Y-83613333D01*
-X178824523Y-83518095D01*
-X178634047Y-83470476D01*
-X178300714Y-83470476D01*
-X178110238Y-83518095D01*
-X178015000Y-83613333D01*
-X177967380Y-83708571D01*
-X177967380Y-83899047D01*
-X178015000Y-83994285D01*
-X178110238Y-84089523D01*
-X178300714Y-84137142D01*
-X178634047Y-84137142D01*
-X178824523Y-84089523D01*
-X178919761Y-83994285D01*
-X178967380Y-83899047D01*
-X178967380Y-83708571D01*
-X178967380Y-85089523D02*
-X178967380Y-84518095D01*
-X178967380Y-84803809D02*
-X177967380Y-84803809D01*
-X178110238Y-84708571D01*
-X178205476Y-84613333D01*
-X178253095Y-84518095D01*
+X176125238Y-87131619D02*
+X176220476Y-87084000D01*
+X176315714Y-86988761D01*
+X176458571Y-86845904D01*
+X176553809Y-86798285D01*
+X176649047Y-86798285D01*
+X176601428Y-87036380D02*
+X176696666Y-86988761D01*
+X176791904Y-86893523D01*
+X176839523Y-86703047D01*
+X176839523Y-86369714D01*
+X176791904Y-86179238D01*
+X176696666Y-86084000D01*
+X176601428Y-86036380D01*
+X176410952Y-86036380D01*
+X176315714Y-86084000D01*
+X176220476Y-86179238D01*
+X176172857Y-86369714D01*
+X176172857Y-86703047D01*
+X176220476Y-86893523D01*
+X176315714Y-86988761D01*
+X176410952Y-87036380D01*
+X176601428Y-87036380D01*
+X175220476Y-87036380D02*
+X175791904Y-87036380D01*
+X175506190Y-87036380D02*
+X175506190Y-86036380D01*
+X175601428Y-86179238D01*
+X175696666Y-86274476D01*
+X175791904Y-86322095D01*
 G04 #@! TO.C,Q2*
 X171030238Y-74072619D02*
 X171125476Y-74025000D01*
diff --git a/plot/ulx3s-Edge.Cuts.gm1 b/plot/ulx3s-Edge.Cuts.gm1
index d1ccd5d..d3c7d73 100644
--- a/plot/ulx3s-Edge.Cuts.gm1
+++ b/plot/ulx3s-Edge.Cuts.gm1
@@ -1,11 +1,11 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-08T13:44:43+02:00*
+G04 #@! TF.CreationDate,2018-06-08T19:59:37+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Profile,NP*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:43 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:37 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Cu.gtl b/plot/ulx3s-F.Cu.gtl
index b640072..7a3c5da 100644
--- a/plot/ulx3s-F.Cu.gtl
+++ b/plot/ulx3s-F.Cu.gtl
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-08T13:44:43+02:00*
+G04 #@! TF.CreationDate,2018-06-08T19:59:36+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L1,Top,Signal*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:43 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:36 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Mask.gts b/plot/ulx3s-F.Mask.gts
index a86d356..34bed81 100644
--- a/plot/ulx3s-F.Mask.gts
+++ b/plot/ulx3s-F.Mask.gts
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-08T13:44:43+02:00*
+G04 #@! TF.CreationDate,2018-06-08T19:59:37+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Soldermask,Top*
 G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:43 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:37 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Paste.gtp b/plot/ulx3s-F.Paste.gtp
index 6caea6e..35ec62a 100644
--- a/plot/ulx3s-F.Paste.gtp
+++ b/plot/ulx3s-F.Paste.gtp
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-08T13:44:43+02:00*
+G04 #@! TF.CreationDate,2018-06-08T19:59:37+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Paste,Top*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:43 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:37 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.SilkS.gto b/plot/ulx3s-F.SilkS.gto
index dae7d9d..10dfafe 100644
--- a/plot/ulx3s-F.SilkS.gto
+++ b/plot/ulx3s-F.SilkS.gto
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-08T13:44:43+02:00*
+G04 #@! TF.CreationDate,2018-06-08T19:59:37+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Legend,Top*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:43 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:37 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -5333,84 +5333,84 @@ X134936595Y-68368380D01*
 X134841357Y-68320761D01*
 X134793738Y-68273142D01*
 G04 #@! TO.C,US1*
-X111013333Y-67141666D02*
-X111013333Y-67708333D01*
-X111046666Y-67775000D01*
-X111080000Y-67808333D01*
-X111146666Y-67841666D01*
-X111280000Y-67841666D01*
-X111346666Y-67808333D01*
-X111380000Y-67775000D01*
-X111413333Y-67708333D01*
-X111413333Y-67141666D01*
-X111713333Y-67808333D02*
-X111813333Y-67841666D01*
-X111980000Y-67841666D01*
-X112046666Y-67808333D01*
-X112080000Y-67775000D01*
-X112113333Y-67708333D01*
-X112113333Y-67641666D01*
-X112080000Y-67575000D01*
-X112046666Y-67541666D01*
-X111980000Y-67508333D01*
-X111846666Y-67475000D01*
-X111780000Y-67441666D01*
-X111746666Y-67408333D01*
-X111713333Y-67341666D01*
-X111713333Y-67275000D01*
-X111746666Y-67208333D01*
-X111780000Y-67175000D01*
-X111846666Y-67141666D01*
-X112013333Y-67141666D01*
-X112113333Y-67175000D01*
-X112780000Y-67841666D02*
-X112380000Y-67841666D01*
-X112580000Y-67841666D02*
-X112580000Y-67141666D01*
-X112513333Y-67241666D01*
-X112446666Y-67308333D01*
-X112380000Y-67341666D01*
+X110641904Y-67113380D02*
+X110641904Y-67922904D01*
+X110689523Y-68018142D01*
+X110737142Y-68065761D01*
+X110832380Y-68113380D01*
+X111022857Y-68113380D01*
+X111118095Y-68065761D01*
+X111165714Y-68018142D01*
+X111213333Y-67922904D01*
+X111213333Y-67113380D01*
+X111641904Y-68065761D02*
+X111784761Y-68113380D01*
+X112022857Y-68113380D01*
+X112118095Y-68065761D01*
+X112165714Y-68018142D01*
+X112213333Y-67922904D01*
+X112213333Y-67827666D01*
+X112165714Y-67732428D01*
+X112118095Y-67684809D01*
+X112022857Y-67637190D01*
+X111832380Y-67589571D01*
+X111737142Y-67541952D01*
+X111689523Y-67494333D01*
+X111641904Y-67399095D01*
+X111641904Y-67303857D01*
+X111689523Y-67208619D01*
+X111737142Y-67161000D01*
+X111832380Y-67113380D01*
+X112070476Y-67113380D01*
+X112213333Y-67161000D01*
+X113165714Y-68113380D02*
+X112594285Y-68113380D01*
+X112880000Y-68113380D02*
+X112880000Y-67113380D01*
+X112784761Y-67256238D01*
+X112689523Y-67351476D01*
+X112594285Y-67399095D01*
 G04 #@! TO.C,US2*
-X169433333Y-67141666D02*
-X169433333Y-67708333D01*
-X169466666Y-67775000D01*
-X169500000Y-67808333D01*
-X169566666Y-67841666D01*
-X169700000Y-67841666D01*
-X169766666Y-67808333D01*
-X169800000Y-67775000D01*
-X169833333Y-67708333D01*
-X169833333Y-67141666D01*
-X170133333Y-67808333D02*
-X170233333Y-67841666D01*
-X170400000Y-67841666D01*
-X170466666Y-67808333D01*
-X170500000Y-67775000D01*
-X170533333Y-67708333D01*
-X170533333Y-67641666D01*
-X170500000Y-67575000D01*
-X170466666Y-67541666D01*
-X170400000Y-67508333D01*
-X170266666Y-67475000D01*
-X170200000Y-67441666D01*
-X170166666Y-67408333D01*
-X170133333Y-67341666D01*
-X170133333Y-67275000D01*
-X170166666Y-67208333D01*
-X170200000Y-67175000D01*
-X170266666Y-67141666D01*
-X170433333Y-67141666D01*
-X170533333Y-67175000D01*
-X170800000Y-67208333D02*
-X170833333Y-67175000D01*
-X170900000Y-67141666D01*
-X171066666Y-67141666D01*
-X171133333Y-67175000D01*
-X171166666Y-67208333D01*
-X171200000Y-67275000D01*
-X171200000Y-67341666D01*
-X171166666Y-67441666D01*
-X170766666Y-67841666D01*
-X171200000Y-67841666D01*
+X169061904Y-67113380D02*
+X169061904Y-67922904D01*
+X169109523Y-68018142D01*
+X169157142Y-68065761D01*
+X169252380Y-68113380D01*
+X169442857Y-68113380D01*
+X169538095Y-68065761D01*
+X169585714Y-68018142D01*
+X169633333Y-67922904D01*
+X169633333Y-67113380D01*
+X170061904Y-68065761D02*
+X170204761Y-68113380D01*
+X170442857Y-68113380D01*
+X170538095Y-68065761D01*
+X170585714Y-68018142D01*
+X170633333Y-67922904D01*
+X170633333Y-67827666D01*
+X170585714Y-67732428D01*
+X170538095Y-67684809D01*
+X170442857Y-67637190D01*
+X170252380Y-67589571D01*
+X170157142Y-67541952D01*
+X170109523Y-67494333D01*
+X170061904Y-67399095D01*
+X170061904Y-67303857D01*
+X170109523Y-67208619D01*
+X170157142Y-67161000D01*
+X170252380Y-67113380D01*
+X170490476Y-67113380D01*
+X170633333Y-67161000D01*
+X171014285Y-67208619D02*
+X171061904Y-67161000D01*
+X171157142Y-67113380D01*
+X171395238Y-67113380D01*
+X171490476Y-67161000D01*
+X171538095Y-67208619D01*
+X171585714Y-67303857D01*
+X171585714Y-67399095D01*
+X171538095Y-67541952D01*
+X170966666Y-68113380D01*
+X171585714Y-68113380D01*
 G04 #@! TD*
 M02*
diff --git a/plot/ulx3s-In1.Cu.g2 b/plot/ulx3s-In1.Cu.g2
index 379e347..1ffd67b 100644
--- a/plot/ulx3s-In1.Cu.g2
+++ b/plot/ulx3s-In1.Cu.g2
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-08T13:44:43+02:00*
+G04 #@! TF.CreationDate,2018-06-08T19:59:36+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L2,Inr,Signal*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:43 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:36 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-In2.Cu.g3 b/plot/ulx3s-In2.Cu.g3
index 126b186..3f75a84 100644
--- a/plot/ulx3s-In2.Cu.g3
+++ b/plot/ulx3s-In2.Cu.g3
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-08T13:44:43+02:00*
+G04 #@! TF.CreationDate,2018-06-08T19:59:36+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L3,Inr,Signal*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:43 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:36 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-bottom.pos b/plot/ulx3s-bottom.pos
index 79588b6..491d3c0 100644
--- a/plot/ulx3s-bottom.pos
+++ b/plot/ulx3s-bottom.pos
@@ -1,4 +1,4 @@
-### Module positions - created on Fri Jun  8 13:44:49 2018 ###
+### Module positions - created on Fri Jun  8 19:59:44 2018 ###
 ### Printed by Pcbnew version kicad 5.0.0-rc2+dfsg1-2
 ## Unit = inches, Angle = deg.
 ## Side : bottom
@@ -137,7 +137,7 @@ RP3       0                R_0805_2012Metric_Pad1.29x1.40mm_HandSolder    -2.180
 U3        TLV62569DBV      TSOT-25                                        -2.6250     0.8000    0.0000  bottom
 U4        TLV62569DBV      TSOT-25                                        -0.3750     1.0750  180.0000  bottom
 U5        TLV62569DBV      TSOT-25                                        -2.5250     1.3200    0.0000  bottom
-U6        FT231XS          SSOP-20_4.4x6.5mm_Pitch0.65mm                  -1.5250     0.2000  180.0000  bottom
+U6        FT231XS          FT231X-SSOP-20_4.4x6.5mm_Pitch0.65mm           -1.5250     0.2000  180.0000  bottom
 U7        PCF8523          SOT96-1                                        -3.1256     0.7443   90.0000  bottom
 U10       IS25LP128F-JBLE  SOA008-150-208mil                              -0.9506     1.0393  270.0000  bottom
 U11       PCA9306D         SM8                                            -1.9913     1.8275   90.0000  bottom
diff --git a/plot/ulx3s-drl_map.gbr b/plot/ulx3s-drl_map.gbr
index e2b8331..f860408 100644
--- a/plot/ulx3s-drl_map.gbr
+++ b/plot/ulx3s-drl_map.gbr
@@ -1,6 +1,6 @@
 %FSLAX45Y45*%
 G04 Gerber Fmt 4.5, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 13:44:40 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Fri Jun  8 19:59:33 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -1840,429 +1840,60 @@ X13513600Y-7122500D02*
 X13513600Y-7222500D01*
 X13463600Y-7172500D02*
 X13563600Y-7172500D01*
-X13169200Y-10028200D02*
-X13270800Y-10129800D01*
-X13270800Y-10028200D02*
-X13169200Y-10129800D01*
-X13255921Y-10114921D02*
-X13255921Y-10043079D01*
-X13184079Y-10043079D01*
-X13184079Y-10114921D01*
-X13255921Y-10114921D01*
-X13423200Y-10028200D02*
-X13524800Y-10129800D01*
-X13524800Y-10028200D02*
-X13423200Y-10129800D01*
-X13509921Y-10114921D02*
-X13509921Y-10043079D01*
-X13438079Y-10043079D01*
-X13438079Y-10114921D01*
-X13509921Y-10114921D01*
-X13677200Y-10028200D02*
-X13778800Y-10129800D01*
-X13778800Y-10028200D02*
-X13677200Y-10129800D01*
-X13763921Y-10114921D02*
-X13763921Y-10043079D01*
-X13692079Y-10043079D01*
-X13692079Y-10114921D01*
-X13763921Y-10114921D01*
-X13931200Y-10028200D02*
-X14032800Y-10129800D01*
-X14032800Y-10028200D02*
-X13931200Y-10129800D01*
-X14017921Y-10114921D02*
-X14017921Y-10043079D01*
-X13946079Y-10043079D01*
-X13946079Y-10114921D01*
-X14017921Y-10114921D01*
-X14185200Y-10028200D02*
-X14286800Y-10129800D01*
-X14286800Y-10028200D02*
-X14185200Y-10129800D01*
-X14271921Y-10114921D02*
-X14271921Y-10043079D01*
-X14200079Y-10043079D01*
-X14200079Y-10114921D01*
-X14271921Y-10114921D01*
-X14439200Y-10028200D02*
-X14540800Y-10129800D01*
-X14540800Y-10028200D02*
-X14439200Y-10129800D01*
-X14525921Y-10114921D02*
-X14525921Y-10043079D01*
-X14454079Y-10043079D01*
-X14454079Y-10114921D01*
-X14525921Y-10114921D01*
-X14693200Y-10028200D02*
-X14794800Y-10129800D01*
-X14794800Y-10028200D02*
-X14693200Y-10129800D01*
-X14779921Y-10114921D02*
-X14779921Y-10043079D01*
-X14708079Y-10043079D01*
-X14708079Y-10114921D01*
-X14779921Y-10114921D01*
-X18376200Y-6218200D02*
-X18477800Y-6319800D01*
-X18477800Y-6218200D02*
-X18376200Y-6319800D01*
-X18462921Y-6304921D02*
-X18462921Y-6233079D01*
-X18391079Y-6233079D01*
-X18391079Y-6304921D01*
-X18462921Y-6304921D01*
-X18376200Y-6472200D02*
-X18477800Y-6573800D01*
-X18477800Y-6472200D02*
-X18376200Y-6573800D01*
-X18462921Y-6558921D02*
-X18462921Y-6487079D01*
-X18391079Y-6487079D01*
-X18391079Y-6558921D01*
-X18462921Y-6558921D01*
-X18376200Y-6726200D02*
-X18477800Y-6827800D01*
-X18477800Y-6726200D02*
-X18376200Y-6827800D01*
-X18462921Y-6812921D02*
-X18462921Y-6741079D01*
-X18391079Y-6741079D01*
-X18391079Y-6812921D01*
-X18462921Y-6812921D01*
-X18376200Y-6980200D02*
-X18477800Y-7081800D01*
-X18477800Y-6980200D02*
-X18376200Y-7081800D01*
-X18462921Y-7066921D02*
-X18462921Y-6995079D01*
-X18391079Y-6995079D01*
-X18391079Y-7066921D01*
-X18462921Y-7066921D01*
-X18376200Y-7234200D02*
-X18477800Y-7335800D01*
-X18477800Y-7234200D02*
-X18376200Y-7335800D01*
-X18462921Y-7320921D02*
-X18462921Y-7249079D01*
-X18391079Y-7249079D01*
-X18391079Y-7320921D01*
-X18462921Y-7320921D01*
-X18376200Y-7488200D02*
-X18477800Y-7589800D01*
-X18477800Y-7488200D02*
-X18376200Y-7589800D01*
-X18462921Y-7574921D02*
-X18462921Y-7503079D01*
-X18391079Y-7503079D01*
-X18391079Y-7574921D01*
-X18462921Y-7574921D01*
-X18376200Y-7742200D02*
-X18477800Y-7843800D01*
-X18477800Y-7742200D02*
-X18376200Y-7843800D01*
-X18462921Y-7828921D02*
-X18462921Y-7757079D01*
-X18391079Y-7757079D01*
-X18391079Y-7828921D01*
-X18462921Y-7828921D01*
-X18376200Y-7996200D02*
-X18477800Y-8097800D01*
-X18477800Y-7996200D02*
-X18376200Y-8097800D01*
-X18462921Y-8082921D02*
-X18462921Y-8011079D01*
-X18391079Y-8011079D01*
-X18391079Y-8082921D01*
-X18462921Y-8082921D01*
-X18376200Y-8250200D02*
-X18477800Y-8351800D01*
-X18477800Y-8250200D02*
-X18376200Y-8351800D01*
-X18462921Y-8336921D02*
-X18462921Y-8265079D01*
-X18391079Y-8265079D01*
-X18391079Y-8336921D01*
-X18462921Y-8336921D01*
-X18376200Y-8504200D02*
-X18477800Y-8605800D01*
-X18477800Y-8504200D02*
-X18376200Y-8605800D01*
-X18462921Y-8590921D02*
-X18462921Y-8519079D01*
-X18391079Y-8519079D01*
-X18391079Y-8590921D01*
-X18462921Y-8590921D01*
-X18376200Y-8758200D02*
-X18477800Y-8859800D01*
-X18477800Y-8758200D02*
-X18376200Y-8859800D01*
-X18462921Y-8844921D02*
-X18462921Y-8773079D01*
-X18391079Y-8773079D01*
-X18391079Y-8844921D01*
-X18462921Y-8844921D01*
-X18376200Y-9012200D02*
-X18477800Y-9113800D01*
-X18477800Y-9012200D02*
-X18376200Y-9113800D01*
-X18462921Y-9098921D02*
-X18462921Y-9027079D01*
-X18391079Y-9027079D01*
-X18391079Y-9098921D01*
-X18462921Y-9098921D01*
-X18376200Y-9266200D02*
-X18477800Y-9367800D01*
-X18477800Y-9266200D02*
-X18376200Y-9367800D01*
-X18462921Y-9352921D02*
-X18462921Y-9281079D01*
-X18391079Y-9281079D01*
-X18391079Y-9352921D01*
-X18462921Y-9352921D01*
-X18376200Y-9520200D02*
-X18477800Y-9621800D01*
-X18477800Y-9520200D02*
-X18376200Y-9621800D01*
-X18462921Y-9606921D02*
-X18462921Y-9535079D01*
-X18391079Y-9535079D01*
-X18391079Y-9606921D01*
-X18462921Y-9606921D01*
-X18376200Y-9774200D02*
-X18477800Y-9875800D01*
-X18477800Y-9774200D02*
-X18376200Y-9875800D01*
-X18462921Y-9860921D02*
-X18462921Y-9789079D01*
-X18391079Y-9789079D01*
-X18391079Y-9860921D01*
-X18462921Y-9860921D01*
-X18376200Y-10028200D02*
-X18477800Y-10129800D01*
-X18477800Y-10028200D02*
-X18376200Y-10129800D01*
-X18462921Y-10114921D02*
-X18462921Y-10043079D01*
-X18391079Y-10043079D01*
-X18391079Y-10114921D01*
-X18462921Y-10114921D01*
-X18376200Y-10282200D02*
-X18477800Y-10383800D01*
-X18477800Y-10282200D02*
-X18376200Y-10383800D01*
-X18462921Y-10368921D02*
-X18462921Y-10297079D01*
-X18391079Y-10297079D01*
-X18391079Y-10368921D01*
-X18462921Y-10368921D01*
-X18376200Y-10536200D02*
-X18477800Y-10637800D01*
-X18477800Y-10536200D02*
-X18376200Y-10637800D01*
-X18462921Y-10622921D02*
-X18462921Y-10551079D01*
-X18391079Y-10551079D01*
-X18391079Y-10622921D01*
-X18462921Y-10622921D01*
-X18376200Y-10790200D02*
-X18477800Y-10891800D01*
-X18477800Y-10790200D02*
-X18376200Y-10891800D01*
-X18462921Y-10876921D02*
-X18462921Y-10805079D01*
-X18391079Y-10805079D01*
-X18391079Y-10876921D01*
-X18462921Y-10876921D01*
-X18376200Y-11044200D02*
-X18477800Y-11145800D01*
-X18477800Y-11044200D02*
-X18376200Y-11145800D01*
-X18462921Y-11130921D02*
-X18462921Y-11059079D01*
-X18391079Y-11059079D01*
-X18391079Y-11130921D01*
-X18462921Y-11130921D01*
-X18630200Y-6218200D02*
-X18731800Y-6319800D01*
-X18731800Y-6218200D02*
-X18630200Y-6319800D01*
-X18716921Y-6304921D02*
-X18716921Y-6233079D01*
-X18645079Y-6233079D01*
-X18645079Y-6304921D01*
-X18716921Y-6304921D01*
-X18630200Y-6472200D02*
-X18731800Y-6573800D01*
-X18731800Y-6472200D02*
-X18630200Y-6573800D01*
-X18716921Y-6558921D02*
-X18716921Y-6487079D01*
-X18645079Y-6487079D01*
-X18645079Y-6558921D01*
-X18716921Y-6558921D01*
-X18630200Y-6726200D02*
-X18731800Y-6827800D01*
-X18731800Y-6726200D02*
-X18630200Y-6827800D01*
-X18716921Y-6812921D02*
-X18716921Y-6741079D01*
-X18645079Y-6741079D01*
-X18645079Y-6812921D01*
-X18716921Y-6812921D01*
-X18630200Y-6980200D02*
-X18731800Y-7081800D01*
-X18731800Y-6980200D02*
-X18630200Y-7081800D01*
-X18716921Y-7066921D02*
-X18716921Y-6995079D01*
-X18645079Y-6995079D01*
-X18645079Y-7066921D01*
-X18716921Y-7066921D01*
-X18630200Y-7234200D02*
-X18731800Y-7335800D01*
-X18731800Y-7234200D02*
-X18630200Y-7335800D01*
-X18716921Y-7320921D02*
-X18716921Y-7249079D01*
-X18645079Y-7249079D01*
-X18645079Y-7320921D01*
-X18716921Y-7320921D01*
-X18630200Y-7488200D02*
-X18731800Y-7589800D01*
-X18731800Y-7488200D02*
-X18630200Y-7589800D01*
-X18716921Y-7574921D02*
-X18716921Y-7503079D01*
-X18645079Y-7503079D01*
-X18645079Y-7574921D01*
-X18716921Y-7574921D01*
-X18630200Y-7742200D02*
-X18731800Y-7843800D01*
-X18731800Y-7742200D02*
-X18630200Y-7843800D01*
-X18716921Y-7828921D02*
-X18716921Y-7757079D01*
-X18645079Y-7757079D01*
-X18645079Y-7828921D01*
-X18716921Y-7828921D01*
-X18630200Y-7996200D02*
-X18731800Y-8097800D01*
-X18731800Y-7996200D02*
-X18630200Y-8097800D01*
-X18716921Y-8082921D02*
-X18716921Y-8011079D01*
-X18645079Y-8011079D01*
-X18645079Y-8082921D01*
-X18716921Y-8082921D01*
-X18630200Y-8250200D02*
-X18731800Y-8351800D01*
-X18731800Y-8250200D02*
-X18630200Y-8351800D01*
-X18716921Y-8336921D02*
-X18716921Y-8265079D01*
-X18645079Y-8265079D01*
-X18645079Y-8336921D01*
-X18716921Y-8336921D01*
-X18630200Y-8504200D02*
-X18731800Y-8605800D01*
-X18731800Y-8504200D02*
-X18630200Y-8605800D01*
-X18716921Y-8590921D02*
-X18716921Y-8519079D01*
-X18645079Y-8519079D01*
-X18645079Y-8590921D01*
-X18716921Y-8590921D01*
-X18630200Y-8758200D02*
-X18731800Y-8859800D01*
-X18731800Y-8758200D02*
-X18630200Y-8859800D01*
-X18716921Y-8844921D02*
-X18716921Y-8773079D01*
-X18645079Y-8773079D01*
-X18645079Y-8844921D01*
-X18716921Y-8844921D01*
-X18630200Y-9012200D02*
-X18731800Y-9113800D01*
-X18731800Y-9012200D02*
-X18630200Y-9113800D01*
-X18716921Y-9098921D02*
-X18716921Y-9027079D01*
-X18645079Y-9027079D01*
-X18645079Y-9098921D01*
-X18716921Y-9098921D01*
-X18630200Y-9266200D02*
-X18731800Y-9367800D01*
-X18731800Y-9266200D02*
-X18630200Y-9367800D01*
-X18716921Y-9352921D02*
-X18716921Y-9281079D01*
-X18645079Y-9281079D01*
-X18645079Y-9352921D01*
-X18716921Y-9352921D01*
-X18630200Y-9520200D02*
-X18731800Y-9621800D01*
-X18731800Y-9520200D02*
-X18630200Y-9621800D01*
-X18716921Y-9606921D02*
-X18716921Y-9535079D01*
-X18645079Y-9535079D01*
-X18645079Y-9606921D01*
-X18716921Y-9606921D01*
-X18630200Y-9774200D02*
-X18731800Y-9875800D01*
-X18731800Y-9774200D02*
-X18630200Y-9875800D01*
-X18716921Y-9860921D02*
-X18716921Y-9789079D01*
-X18645079Y-9789079D01*
-X18645079Y-9860921D01*
-X18716921Y-9860921D01*
-X18630200Y-10028200D02*
-X18731800Y-10129800D01*
-X18731800Y-10028200D02*
-X18630200Y-10129800D01*
-X18716921Y-10114921D02*
-X18716921Y-10043079D01*
-X18645079Y-10043079D01*
-X18645079Y-10114921D01*
-X18716921Y-10114921D01*
-X18630200Y-10282200D02*
-X18731800Y-10383800D01*
-X18731800Y-10282200D02*
-X18630200Y-10383800D01*
-X18716921Y-10368921D02*
-X18716921Y-10297079D01*
-X18645079Y-10297079D01*
-X18645079Y-10368921D01*
-X18716921Y-10368921D01*
-X18630200Y-10536200D02*
-X18731800Y-10637800D01*
-X18731800Y-10536200D02*
-X18630200Y-10637800D01*
-X18716921Y-10622921D02*
-X18716921Y-10551079D01*
-X18645079Y-10551079D01*
-X18645079Y-10622921D01*
-X18716921Y-10622921D01*
-X18630200Y-10790200D02*
-X18731800Y-10891800D01*
-X18731800Y-10790200D02*
-X18630200Y-10891800D01*
-X18716921Y-10876921D02*
-X18716921Y-10805079D01*
-X18645079Y-10805079D01*
-X18645079Y-10876921D01*
-X18716921Y-10876921D01*
-X18630200Y-11044200D02*
-X18731800Y-11145800D01*
-X18731800Y-11044200D02*
-X18630200Y-11145800D01*
-X18716921Y-11130921D02*
-X18716921Y-11059079D01*
-X18645079Y-11059079D01*
-X18645079Y-11130921D01*
-X18716921Y-11130921D01*
+X13740700Y-10409200D02*
+X13842300Y-10510800D01*
+X13842300Y-10409200D02*
+X13740700Y-10510800D01*
+X13827421Y-10495921D02*
+X13827421Y-10424079D01*
+X13755579Y-10424079D01*
+X13755579Y-10495921D01*
+X13827421Y-10495921D01*
+X13740700Y-10663200D02*
+X13842300Y-10764800D01*
+X13842300Y-10663200D02*
+X13740700Y-10764800D01*
+X13827421Y-10749921D02*
+X13827421Y-10678079D01*
+X13755579Y-10678079D01*
+X13755579Y-10749921D01*
+X13827421Y-10749921D01*
+X13740700Y-10917200D02*
+X13842300Y-11018800D01*
+X13842300Y-10917200D02*
+X13740700Y-11018800D01*
+X13827421Y-11003921D02*
+X13827421Y-10932079D01*
+X13755579Y-10932079D01*
+X13755579Y-11003921D01*
+X13827421Y-11003921D01*
+X13994700Y-10409200D02*
+X14096300Y-10510800D01*
+X14096300Y-10409200D02*
+X13994700Y-10510800D01*
+X14081421Y-10495921D02*
+X14081421Y-10424079D01*
+X14009579Y-10424079D01*
+X14009579Y-10495921D01*
+X14081421Y-10495921D01*
+X13994700Y-10663200D02*
+X14096300Y-10764800D01*
+X14096300Y-10663200D02*
+X13994700Y-10764800D01*
+X14081421Y-10749921D02*
+X14081421Y-10678079D01*
+X14009579Y-10678079D01*
+X14009579Y-10749921D01*
+X14081421Y-10749921D01*
+X13994700Y-10917200D02*
+X14096300Y-11018800D01*
+X14096300Y-10917200D02*
+X13994700Y-11018800D01*
+X14081421Y-11003921D02*
+X14081421Y-10932079D01*
+X14009579Y-10932079D01*
+X14009579Y-11003921D01*
+X14081421Y-11003921D01*
 X9486200Y-6218200D02*
 X9587800Y-6319800D01*
 X9587800Y-6218200D02*
@@ -2623,60 +2254,429 @@ X9826921Y-11059079D01*
 X9755079Y-11059079D01*
 X9755079Y-11130921D01*
 X9826921Y-11130921D01*
-X13740700Y-10409200D02*
-X13842300Y-10510800D01*
-X13842300Y-10409200D02*
-X13740700Y-10510800D01*
-X13827421Y-10495921D02*
-X13827421Y-10424079D01*
-X13755579Y-10424079D01*
-X13755579Y-10495921D01*
-X13827421Y-10495921D01*
-X13740700Y-10663200D02*
-X13842300Y-10764800D01*
-X13842300Y-10663200D02*
-X13740700Y-10764800D01*
-X13827421Y-10749921D02*
-X13827421Y-10678079D01*
-X13755579Y-10678079D01*
-X13755579Y-10749921D01*
-X13827421Y-10749921D01*
-X13740700Y-10917200D02*
-X13842300Y-11018800D01*
-X13842300Y-10917200D02*
-X13740700Y-11018800D01*
-X13827421Y-11003921D02*
-X13827421Y-10932079D01*
-X13755579Y-10932079D01*
-X13755579Y-11003921D01*
-X13827421Y-11003921D01*
-X13994700Y-10409200D02*
-X14096300Y-10510800D01*
-X14096300Y-10409200D02*
-X13994700Y-10510800D01*
-X14081421Y-10495921D02*
-X14081421Y-10424079D01*
-X14009579Y-10424079D01*
-X14009579Y-10495921D01*
-X14081421Y-10495921D01*
-X13994700Y-10663200D02*
-X14096300Y-10764800D01*
-X14096300Y-10663200D02*
-X13994700Y-10764800D01*
-X14081421Y-10749921D02*
-X14081421Y-10678079D01*
-X14009579Y-10678079D01*
-X14009579Y-10749921D01*
-X14081421Y-10749921D01*
-X13994700Y-10917200D02*
-X14096300Y-11018800D01*
-X14096300Y-10917200D02*
-X13994700Y-11018800D01*
-X14081421Y-11003921D02*
-X14081421Y-10932079D01*
-X14009579Y-10932079D01*
-X14009579Y-11003921D01*
-X14081421Y-11003921D01*
+X18376200Y-6218200D02*
+X18477800Y-6319800D01*
+X18477800Y-6218200D02*
+X18376200Y-6319800D01*
+X18462921Y-6304921D02*
+X18462921Y-6233079D01*
+X18391079Y-6233079D01*
+X18391079Y-6304921D01*
+X18462921Y-6304921D01*
+X18376200Y-6472200D02*
+X18477800Y-6573800D01*
+X18477800Y-6472200D02*
+X18376200Y-6573800D01*
+X18462921Y-6558921D02*
+X18462921Y-6487079D01*
+X18391079Y-6487079D01*
+X18391079Y-6558921D01*
+X18462921Y-6558921D01*
+X18376200Y-6726200D02*
+X18477800Y-6827800D01*
+X18477800Y-6726200D02*
+X18376200Y-6827800D01*
+X18462921Y-6812921D02*
+X18462921Y-6741079D01*
+X18391079Y-6741079D01*
+X18391079Y-6812921D01*
+X18462921Y-6812921D01*
+X18376200Y-6980200D02*
+X18477800Y-7081800D01*
+X18477800Y-6980200D02*
+X18376200Y-7081800D01*
+X18462921Y-7066921D02*
+X18462921Y-6995079D01*
+X18391079Y-6995079D01*
+X18391079Y-7066921D01*
+X18462921Y-7066921D01*
+X18376200Y-7234200D02*
+X18477800Y-7335800D01*
+X18477800Y-7234200D02*
+X18376200Y-7335800D01*
+X18462921Y-7320921D02*
+X18462921Y-7249079D01*
+X18391079Y-7249079D01*
+X18391079Y-7320921D01*
+X18462921Y-7320921D01*
+X18376200Y-7488200D02*
+X18477800Y-7589800D01*
+X18477800Y-7488200D02*
+X18376200Y-7589800D01*
+X18462921Y-7574921D02*
+X18462921Y-7503079D01*
+X18391079Y-7503079D01*
+X18391079Y-7574921D01*
+X18462921Y-7574921D01*
+X18376200Y-7742200D02*
+X18477800Y-7843800D01*
+X18477800Y-7742200D02*
+X18376200Y-7843800D01*
+X18462921Y-7828921D02*
+X18462921Y-7757079D01*
+X18391079Y-7757079D01*
+X18391079Y-7828921D01*
+X18462921Y-7828921D01*
+X18376200Y-7996200D02*
+X18477800Y-8097800D01*
+X18477800Y-7996200D02*
+X18376200Y-8097800D01*
+X18462921Y-8082921D02*
+X18462921Y-8011079D01*
+X18391079Y-8011079D01*
+X18391079Y-8082921D01*
+X18462921Y-8082921D01*
+X18376200Y-8250200D02*
+X18477800Y-8351800D01*
+X18477800Y-8250200D02*
+X18376200Y-8351800D01*
+X18462921Y-8336921D02*
+X18462921Y-8265079D01*
+X18391079Y-8265079D01*
+X18391079Y-8336921D01*
+X18462921Y-8336921D01*
+X18376200Y-8504200D02*
+X18477800Y-8605800D01*
+X18477800Y-8504200D02*
+X18376200Y-8605800D01*
+X18462921Y-8590921D02*
+X18462921Y-8519079D01*
+X18391079Y-8519079D01*
+X18391079Y-8590921D01*
+X18462921Y-8590921D01*
+X18376200Y-8758200D02*
+X18477800Y-8859800D01*
+X18477800Y-8758200D02*
+X18376200Y-8859800D01*
+X18462921Y-8844921D02*
+X18462921Y-8773079D01*
+X18391079Y-8773079D01*
+X18391079Y-8844921D01*
+X18462921Y-8844921D01*
+X18376200Y-9012200D02*
+X18477800Y-9113800D01*
+X18477800Y-9012200D02*
+X18376200Y-9113800D01*
+X18462921Y-9098921D02*
+X18462921Y-9027079D01*
+X18391079Y-9027079D01*
+X18391079Y-9098921D01*
+X18462921Y-9098921D01*
+X18376200Y-9266200D02*
+X18477800Y-9367800D01*
+X18477800Y-9266200D02*
+X18376200Y-9367800D01*
+X18462921Y-9352921D02*
+X18462921Y-9281079D01*
+X18391079Y-9281079D01*
+X18391079Y-9352921D01*
+X18462921Y-9352921D01*
+X18376200Y-9520200D02*
+X18477800Y-9621800D01*
+X18477800Y-9520200D02*
+X18376200Y-9621800D01*
+X18462921Y-9606921D02*
+X18462921Y-9535079D01*
+X18391079Y-9535079D01*
+X18391079Y-9606921D01*
+X18462921Y-9606921D01*
+X18376200Y-9774200D02*
+X18477800Y-9875800D01*
+X18477800Y-9774200D02*
+X18376200Y-9875800D01*
+X18462921Y-9860921D02*
+X18462921Y-9789079D01*
+X18391079Y-9789079D01*
+X18391079Y-9860921D01*
+X18462921Y-9860921D01*
+X18376200Y-10028200D02*
+X18477800Y-10129800D01*
+X18477800Y-10028200D02*
+X18376200Y-10129800D01*
+X18462921Y-10114921D02*
+X18462921Y-10043079D01*
+X18391079Y-10043079D01*
+X18391079Y-10114921D01*
+X18462921Y-10114921D01*
+X18376200Y-10282200D02*
+X18477800Y-10383800D01*
+X18477800Y-10282200D02*
+X18376200Y-10383800D01*
+X18462921Y-10368921D02*
+X18462921Y-10297079D01*
+X18391079Y-10297079D01*
+X18391079Y-10368921D01*
+X18462921Y-10368921D01*
+X18376200Y-10536200D02*
+X18477800Y-10637800D01*
+X18477800Y-10536200D02*
+X18376200Y-10637800D01*
+X18462921Y-10622921D02*
+X18462921Y-10551079D01*
+X18391079Y-10551079D01*
+X18391079Y-10622921D01*
+X18462921Y-10622921D01*
+X18376200Y-10790200D02*
+X18477800Y-10891800D01*
+X18477800Y-10790200D02*
+X18376200Y-10891800D01*
+X18462921Y-10876921D02*
+X18462921Y-10805079D01*
+X18391079Y-10805079D01*
+X18391079Y-10876921D01*
+X18462921Y-10876921D01*
+X18376200Y-11044200D02*
+X18477800Y-11145800D01*
+X18477800Y-11044200D02*
+X18376200Y-11145800D01*
+X18462921Y-11130921D02*
+X18462921Y-11059079D01*
+X18391079Y-11059079D01*
+X18391079Y-11130921D01*
+X18462921Y-11130921D01*
+X18630200Y-6218200D02*
+X18731800Y-6319800D01*
+X18731800Y-6218200D02*
+X18630200Y-6319800D01*
+X18716921Y-6304921D02*
+X18716921Y-6233079D01*
+X18645079Y-6233079D01*
+X18645079Y-6304921D01*
+X18716921Y-6304921D01*
+X18630200Y-6472200D02*
+X18731800Y-6573800D01*
+X18731800Y-6472200D02*
+X18630200Y-6573800D01*
+X18716921Y-6558921D02*
+X18716921Y-6487079D01*
+X18645079Y-6487079D01*
+X18645079Y-6558921D01*
+X18716921Y-6558921D01*
+X18630200Y-6726200D02*
+X18731800Y-6827800D01*
+X18731800Y-6726200D02*
+X18630200Y-6827800D01*
+X18716921Y-6812921D02*
+X18716921Y-6741079D01*
+X18645079Y-6741079D01*
+X18645079Y-6812921D01*
+X18716921Y-6812921D01*
+X18630200Y-6980200D02*
+X18731800Y-7081800D01*
+X18731800Y-6980200D02*
+X18630200Y-7081800D01*
+X18716921Y-7066921D02*
+X18716921Y-6995079D01*
+X18645079Y-6995079D01*
+X18645079Y-7066921D01*
+X18716921Y-7066921D01*
+X18630200Y-7234200D02*
+X18731800Y-7335800D01*
+X18731800Y-7234200D02*
+X18630200Y-7335800D01*
+X18716921Y-7320921D02*
+X18716921Y-7249079D01*
+X18645079Y-7249079D01*
+X18645079Y-7320921D01*
+X18716921Y-7320921D01*
+X18630200Y-7488200D02*
+X18731800Y-7589800D01*
+X18731800Y-7488200D02*
+X18630200Y-7589800D01*
+X18716921Y-7574921D02*
+X18716921Y-7503079D01*
+X18645079Y-7503079D01*
+X18645079Y-7574921D01*
+X18716921Y-7574921D01*
+X18630200Y-7742200D02*
+X18731800Y-7843800D01*
+X18731800Y-7742200D02*
+X18630200Y-7843800D01*
+X18716921Y-7828921D02*
+X18716921Y-7757079D01*
+X18645079Y-7757079D01*
+X18645079Y-7828921D01*
+X18716921Y-7828921D01*
+X18630200Y-7996200D02*
+X18731800Y-8097800D01*
+X18731800Y-7996200D02*
+X18630200Y-8097800D01*
+X18716921Y-8082921D02*
+X18716921Y-8011079D01*
+X18645079Y-8011079D01*
+X18645079Y-8082921D01*
+X18716921Y-8082921D01*
+X18630200Y-8250200D02*
+X18731800Y-8351800D01*
+X18731800Y-8250200D02*
+X18630200Y-8351800D01*
+X18716921Y-8336921D02*
+X18716921Y-8265079D01*
+X18645079Y-8265079D01*
+X18645079Y-8336921D01*
+X18716921Y-8336921D01*
+X18630200Y-8504200D02*
+X18731800Y-8605800D01*
+X18731800Y-8504200D02*
+X18630200Y-8605800D01*
+X18716921Y-8590921D02*
+X18716921Y-8519079D01*
+X18645079Y-8519079D01*
+X18645079Y-8590921D01*
+X18716921Y-8590921D01*
+X18630200Y-8758200D02*
+X18731800Y-8859800D01*
+X18731800Y-8758200D02*
+X18630200Y-8859800D01*
+X18716921Y-8844921D02*
+X18716921Y-8773079D01*
+X18645079Y-8773079D01*
+X18645079Y-8844921D01*
+X18716921Y-8844921D01*
+X18630200Y-9012200D02*
+X18731800Y-9113800D01*
+X18731800Y-9012200D02*
+X18630200Y-9113800D01*
+X18716921Y-9098921D02*
+X18716921Y-9027079D01*
+X18645079Y-9027079D01*
+X18645079Y-9098921D01*
+X18716921Y-9098921D01*
+X18630200Y-9266200D02*
+X18731800Y-9367800D01*
+X18731800Y-9266200D02*
+X18630200Y-9367800D01*
+X18716921Y-9352921D02*
+X18716921Y-9281079D01*
+X18645079Y-9281079D01*
+X18645079Y-9352921D01*
+X18716921Y-9352921D01*
+X18630200Y-9520200D02*
+X18731800Y-9621800D01*
+X18731800Y-9520200D02*
+X18630200Y-9621800D01*
+X18716921Y-9606921D02*
+X18716921Y-9535079D01*
+X18645079Y-9535079D01*
+X18645079Y-9606921D01*
+X18716921Y-9606921D01*
+X18630200Y-9774200D02*
+X18731800Y-9875800D01*
+X18731800Y-9774200D02*
+X18630200Y-9875800D01*
+X18716921Y-9860921D02*
+X18716921Y-9789079D01*
+X18645079Y-9789079D01*
+X18645079Y-9860921D01*
+X18716921Y-9860921D01*
+X18630200Y-10028200D02*
+X18731800Y-10129800D01*
+X18731800Y-10028200D02*
+X18630200Y-10129800D01*
+X18716921Y-10114921D02*
+X18716921Y-10043079D01*
+X18645079Y-10043079D01*
+X18645079Y-10114921D01*
+X18716921Y-10114921D01*
+X18630200Y-10282200D02*
+X18731800Y-10383800D01*
+X18731800Y-10282200D02*
+X18630200Y-10383800D01*
+X18716921Y-10368921D02*
+X18716921Y-10297079D01*
+X18645079Y-10297079D01*
+X18645079Y-10368921D01*
+X18716921Y-10368921D01*
+X18630200Y-10536200D02*
+X18731800Y-10637800D01*
+X18731800Y-10536200D02*
+X18630200Y-10637800D01*
+X18716921Y-10622921D02*
+X18716921Y-10551079D01*
+X18645079Y-10551079D01*
+X18645079Y-10622921D01*
+X18716921Y-10622921D01*
+X18630200Y-10790200D02*
+X18731800Y-10891800D01*
+X18731800Y-10790200D02*
+X18630200Y-10891800D01*
+X18716921Y-10876921D02*
+X18716921Y-10805079D01*
+X18645079Y-10805079D01*
+X18645079Y-10876921D01*
+X18716921Y-10876921D01*
+X18630200Y-11044200D02*
+X18731800Y-11145800D01*
+X18731800Y-11044200D02*
+X18630200Y-11145800D01*
+X18716921Y-11130921D02*
+X18716921Y-11059079D01*
+X18645079Y-11059079D01*
+X18645079Y-11130921D01*
+X18716921Y-11130921D01*
+X13169200Y-10028200D02*
+X13270800Y-10129800D01*
+X13270800Y-10028200D02*
+X13169200Y-10129800D01*
+X13255921Y-10114921D02*
+X13255921Y-10043079D01*
+X13184079Y-10043079D01*
+X13184079Y-10114921D01*
+X13255921Y-10114921D01*
+X13423200Y-10028200D02*
+X13524800Y-10129800D01*
+X13524800Y-10028200D02*
+X13423200Y-10129800D01*
+X13509921Y-10114921D02*
+X13509921Y-10043079D01*
+X13438079Y-10043079D01*
+X13438079Y-10114921D01*
+X13509921Y-10114921D01*
+X13677200Y-10028200D02*
+X13778800Y-10129800D01*
+X13778800Y-10028200D02*
+X13677200Y-10129800D01*
+X13763921Y-10114921D02*
+X13763921Y-10043079D01*
+X13692079Y-10043079D01*
+X13692079Y-10114921D01*
+X13763921Y-10114921D01*
+X13931200Y-10028200D02*
+X14032800Y-10129800D01*
+X14032800Y-10028200D02*
+X13931200Y-10129800D01*
+X14017921Y-10114921D02*
+X14017921Y-10043079D01*
+X13946079Y-10043079D01*
+X13946079Y-10114921D01*
+X14017921Y-10114921D01*
+X14185200Y-10028200D02*
+X14286800Y-10129800D01*
+X14286800Y-10028200D02*
+X14185200Y-10129800D01*
+X14271921Y-10114921D02*
+X14271921Y-10043079D01*
+X14200079Y-10043079D01*
+X14200079Y-10114921D01*
+X14271921Y-10114921D01*
+X14439200Y-10028200D02*
+X14540800Y-10129800D01*
+X14540800Y-10028200D02*
+X14439200Y-10129800D01*
+X14525921Y-10114921D02*
+X14525921Y-10043079D01*
+X14454079Y-10043079D01*
+X14454079Y-10114921D01*
+X14525921Y-10114921D01*
+X14693200Y-10028200D02*
+X14794800Y-10129800D01*
+X14794800Y-10028200D02*
+X14693200Y-10129800D01*
+X14779921Y-10114921D02*
+X14779921Y-10043079D01*
+X14708079Y-10043079D01*
+X14708079Y-10114921D01*
+X14779921Y-10114921D01*
 X13679600Y-6376200D02*
 X13809600Y-6506200D01*
 X13809600Y-6376200D02*
@@ -2729,14 +2729,6 @@ X18079000Y-10841000D02*
 G75*
 G03X18079000Y-10841000I-160000J0D01*
 G01*
-X10299000Y-6363000D02*
-X10299000Y-6683000D01*
-X10139000Y-6523000D02*
-X10459000Y-6523000D01*
-X10459000Y-6523000D02*
-G75*
-G03X10459000Y-6523000I-160000J0D01*
-G01*
 X17919000Y-6363000D02*
 X17919000Y-6683000D01*
 X17759000Y-6523000D02*
@@ -2745,6 +2737,14 @@ X18079000Y-6523000D02*
 G75*
 G03X18079000Y-6523000I-160000J0D01*
 G01*
+X10299000Y-6363000D02*
+X10299000Y-6683000D01*
+X10139000Y-6523000D02*
+X10459000Y-6523000D01*
+X10459000Y-6523000D02*
+G75*
+G03X10459000Y-6523000I-160000J0D01*
+G01*
 X12506905Y-6711905D02*
 X12506905Y-6591695D01*
 X12386695Y-6591695D01*
diff --git a/plot/ulx3s-top.pos b/plot/ulx3s-top.pos
index 1727bfe..88adb2e 100644
--- a/plot/ulx3s-top.pos
+++ b/plot/ulx3s-top.pos
@@ -1,4 +1,4 @@
-### Module positions - created on Fri Jun  8 13:44:49 2018 ###
+### Module positions - created on Fri Jun  8 19:59:44 2018 ###
 ### Printed by Pcbnew version kicad 5.0.0-rc2+dfsg1-2
 ## Unit = inches, Angle = deg.
 ## Side : top
diff --git a/plot/ulx3s.drl b/plot/ulx3s.drl
index 16a6e47..e6da0ab 100644
--- a/plot/ulx3s.drl
+++ b/plot/ulx3s.drl
@@ -1,5 +1,5 @@
 M48
-;DRILL file {KiCad 5.0.0-rc2+dfsg1-2} date Fri Jun  8 13:44:40 2018
+;DRILL file {KiCad 5.0.0-rc2+dfsg1-2} date Fri Jun  8 19:59:33 2018
 ;FORMAT={-:-/ absolute / inch / decimal}
 FMAT,2
 INCH,TZ
@@ -453,53 +453,12 @@ X5.1203Y-2.8238
 X5.2203Y-2.8238
 X5.3203Y-2.8238
 T8
-X5.2047Y-3.9681
-X5.3047Y-3.9681
-X5.4047Y-3.9681
-X5.5047Y-3.9681
-X5.6047Y-3.9681
-X5.7047Y-3.9681
-X5.8047Y-3.9681
-X7.2547Y-2.4681
-X7.2547Y-2.5681
-X7.2547Y-2.6681
-X7.2547Y-2.7681
-X7.2547Y-2.8681
-X7.2547Y-2.9681
-X7.2547Y-3.0681
-X7.2547Y-3.1681
-X7.2547Y-3.2681
-X7.2547Y-3.3681
-X7.2547Y-3.4681
-X7.2547Y-3.5681
-X7.2547Y-3.6681
-X7.2547Y-3.7681
-X7.2547Y-3.8681
-X7.2547Y-3.9681
-X7.2547Y-4.0681
-X7.2547Y-4.1681
-X7.2547Y-4.2681
-X7.2547Y-4.3681
-X7.3547Y-2.4681
-X7.3547Y-2.5681
-X7.3547Y-2.6681
-X7.3547Y-2.7681
-X7.3547Y-2.8681
-X7.3547Y-2.9681
-X7.3547Y-3.0681
-X7.3547Y-3.1681
-X7.3547Y-3.2681
-X7.3547Y-3.3681
-X7.3547Y-3.4681
-X7.3547Y-3.5681
-X7.3547Y-3.6681
-X7.3547Y-3.7681
-X7.3547Y-3.8681
-X7.3547Y-3.9681
-X7.3547Y-4.0681
-X7.3547Y-4.1681
-X7.3547Y-4.2681
-X7.3547Y-4.3681
+X5.4297Y-4.1181
+X5.4297Y-4.2181
+X5.4297Y-4.3181
+X5.5297Y-4.1181
+X5.5297Y-4.2181
+X5.5297Y-4.3181
 X3.7547Y-2.4681
 X3.7547Y-2.5681
 X3.7547Y-2.6681
@@ -540,12 +499,53 @@ X3.8547Y-4.0681
 X3.8547Y-4.1681
 X3.8547Y-4.2681
 X3.8547Y-4.3681
-X5.4297Y-4.1181
-X5.4297Y-4.2181
-X5.4297Y-4.3181
-X5.5297Y-4.1181
-X5.5297Y-4.2181
-X5.5297Y-4.3181
+X7.2547Y-2.4681
+X7.2547Y-2.5681
+X7.2547Y-2.6681
+X7.2547Y-2.7681
+X7.2547Y-2.8681
+X7.2547Y-2.9681
+X7.2547Y-3.0681
+X7.2547Y-3.1681
+X7.2547Y-3.2681
+X7.2547Y-3.3681
+X7.2547Y-3.4681
+X7.2547Y-3.5681
+X7.2547Y-3.6681
+X7.2547Y-3.7681
+X7.2547Y-3.8681
+X7.2547Y-3.9681
+X7.2547Y-4.0681
+X7.2547Y-4.1681
+X7.2547Y-4.2681
+X7.2547Y-4.3681
+X7.3547Y-2.4681
+X7.3547Y-2.5681
+X7.3547Y-2.6681
+X7.3547Y-2.7681
+X7.3547Y-2.8681
+X7.3547Y-2.9681
+X7.3547Y-3.0681
+X7.3547Y-3.1681
+X7.3547Y-3.2681
+X7.3547Y-3.3681
+X7.3547Y-3.4681
+X7.3547Y-3.5681
+X7.3547Y-3.6681
+X7.3547Y-3.7681
+X7.3547Y-3.8681
+X7.3547Y-3.9681
+X7.3547Y-4.0681
+X7.3547Y-4.1681
+X7.3547Y-4.2681
+X7.3547Y-4.3681
+X5.2047Y-3.9681
+X5.3047Y-3.9681
+X5.4047Y-3.9681
+X5.5047Y-3.9681
+X5.6047Y-3.9681
+X5.7047Y-3.9681
+X5.8047Y-3.9681
 T9
 X5.4113Y-2.5359
 X5.4349Y-2.7288
@@ -554,8 +554,8 @@ X6.0294Y-2.5359
 T10
 X4.0547Y-4.2681
 X7.0547Y-4.2681
-X4.0547Y-2.5681
 X7.0547Y-2.5681
+X4.0547Y-2.5681
 T11
 X4.9003Y-2.6188
 X4.9003Y-2.8944