From 94d293bdb005b01210273ee4b2c2f6c5e5fc763e Mon Sep 17 00:00:00 2001
From: Martin Schramm <mschramm@sysmocom.de>
Date: Tue, 24 Sep 2019 18:25:08 +0200
Subject: ngff: re-introduce and re-position OSHW logo and bott silk screen

---
 ngff-breakout/ngff-breakout.brd | 788 ++++++++++++++++++++++++++--------------
 ngff-breakout/ngff-breakout.sch | 314 ++++++++--------
 2 files changed, 667 insertions(+), 435 deletions(-)

diff --git a/ngff-breakout/ngff-breakout.brd b/ngff-breakout/ngff-breakout.brd
index 048f767..a4e8842 100644
--- a/ngff-breakout/ngff-breakout.brd
+++ b/ngff-breakout/ngff-breakout.brd
@@ -9,7 +9,7 @@
 <grid distance="0.3175" unitdist="mm" unit="mm" style="lines" multiple="1" display="no" altdistance="0.15875" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
-<layer number="2" name="Route2" color="11" fill="3" visible="yes" active="yes"/>
+<layer number="2" name="Route2" color="11" fill="3" visible="no" active="yes"/>
 <layer number="3" name="Route3" color="4" fill="3" visible="no" active="no"/>
 <layer number="4" name="Route4" color="1" fill="4" visible="no" active="no"/>
 <layer number="5" name="Route5" color="4" fill="4" visible="no" active="no"/>
@@ -22,18 +22,18 @@
 <layer number="12" name="Route12" color="1" fill="5" visible="no" active="no"/>
 <layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
 <layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
-<layer number="15" name="Route15" color="14" fill="6" visible="yes" active="yes"/>
+<layer number="15" name="Route15" color="14" fill="6" visible="no" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
@@ -106,6 +106,14 @@ License: CC-BY-SA</text>
 <text x="14.605" y="18.0975" size="1.778" layer="25" ratio="18" rot="SR270">6V max!</text>
 <text x="60.9905" y="45.085" size="1.778" layer="25" font="vector" ratio="18" rot="R180" align="top-left">1</text>
 <text x="75.913" y="45.085" size="1.778" layer="25" font="vector" ratio="18" rot="R180" align="top-left">9</text>
+<text x="75.438" y="74.77" size="1" layer="26" font="vector" ratio="16" rot="MR0">M.2 / NGFF WWAN breakout</text>
+<text x="75.3745" y="71.72325" size="1" layer="26" font="vector" ratio="16" rot="MR0">(C) 2019 sysmocom GmbH
+License: CC-BY-SA</text>
+<text x="53.848" y="74.897" size="1" layer="26" font="vector" ratio="16" rot="MR0">&gt;VERSION</text>
+<text x="75.438" y="74.77" size="1" layer="16" font="vector" ratio="18" rot="MR0">M.2 / NGFF WWAN breakout</text>
+<text x="75.3745" y="71.72325" size="1" layer="16" font="vector" ratio="18" rot="MR0">(C) 2019 sysmocom GmbH
+License: CC-BY-SA</text>
+<text x="53.848" y="74.897" size="1" layer="16" font="vector" ratio="18" rot="MR0">&gt;VERSION</text>
 </plain>
 <libraries>
 <library name="SF7W008S1A-SIM">
@@ -613,6 +621,77 @@ Source: http://www.osram.convergy.de/ ... Lb_q993.pdf</description>
 <rectangle x1="4.826" y1="1.016" x2="5.334" y2="1.524" layer="51"/>
 <rectangle x1="4.826" y1="-1.524" x2="5.334" y2="-1.016" layer="51"/>
 </package>
+<package name="WEEE_BIN_TOP">
+<description>WEEE bin according to Article 11(2) of the WEEE directive</description>
+<wire x1="-5" y1="-5.11" x2="6.5" y2="6.69" width="0.2" layer="1"/>
+<wire x1="-5.3" y1="6.59" x2="5.7" y2="-5.21" width="0.2" layer="1"/>
+<wire x1="1.6" y1="-3.51" x2="-1.1" y2="-3.51" width="0.2" layer="1"/>
+<wire x1="-1.1" y1="-3.51" x2="-1.4" y2="-3.21" width="0.2" layer="1" curve="-90"/>
+<wire x1="-1.4" y1="-3.21" x2="-2" y2="4.49" width="0.2" layer="1"/>
+<wire x1="-2" y1="4.49" x2="-2" y2="4.69" width="0.2" layer="1"/>
+<wire x1="-2" y1="4.69" x2="-1.7" y2="5.29" width="0.2" layer="1" curve="-53.130102"/>
+<wire x1="-1.7" y1="5.29" x2="-1.2" y2="5.49" width="0.2" layer="1" curve="-30.139189"/>
+<wire x1="-1.2" y1="5.49" x2="0.1" y2="5.59" width="0.2" layer="1" curve="-4.666241"/>
+<wire x1="0.1" y1="5.59" x2="0.1" y2="5.79" width="0.2" layer="1"/>
+<wire x1="0.1" y1="5.79" x2="1.4" y2="5.79" width="0.2" layer="1"/>
+<wire x1="1.4" y1="5.79" x2="1.4" y2="5.39" width="0.2" layer="1"/>
+<wire x1="1.4" y1="5.39" x2="0.1" y2="5.39" width="0.2" layer="1"/>
+<wire x1="0.1" y1="5.39" x2="0.1" y2="5.59" width="0.2" layer="1"/>
+<wire x1="1.5" y1="5.59" x2="1.6" y2="5.59" width="0.2" layer="1"/>
+<wire x1="1.6" y1="5.59" x2="2.5" y2="5.49" width="0.2" layer="1" curve="-12.680383"/>
+<wire x1="2.5" y1="5.49" x2="3.1" y2="5.09" width="0.2" layer="1" curve="-42.011125"/>
+<wire x1="3.1" y1="5.09" x2="3.2" y2="4.79" width="0.2" layer="1" curve="-33.736084"/>
+<wire x1="3.2" y1="4.79" x2="2.7" y2="-1.91" width="0.2" layer="1"/>
+<wire x1="3.175" y1="2.79" x2="3.8" y2="2.79" width="0.2" layer="1"/>
+<wire x1="3.8" y1="2.79" x2="3.8" y2="3.815" width="0.2" layer="1"/>
+<wire x1="3.8" y1="3.815" x2="3.225" y2="3.815" width="0.2" layer="1"/>
+<wire x1="-1.3" y1="4.69" x2="-1.35" y2="5.59" width="0.2" layer="1"/>
+<wire x1="-1.35" y1="5.59" x2="-1.15" y2="5.59" width="0.2" layer="1" curve="-192.667806"/>
+<wire x1="-1.15" y1="5.59" x2="-1.2" y2="4.69" width="0.2" layer="1"/>
+<wire x1="-1.2" y1="4.69" x2="-1.3" y2="4.69" width="0.2" layer="1"/>
+<circle x="2.6" y="-3.185" radius="0.9013" width="0.2" layer="1"/>
+<circle x="3.65" y="4.84" radius="0.45" width="0.2" layer="1"/>
+<circle x="2.6" y="-3.185" radius="0.5" width="0.2" layer="1"/>
+<rectangle x1="-2.65" y1="4.415" x2="3.225" y2="4.84" layer="1"/>
+<rectangle x1="-0.05" y1="2.04" x2="1.975" y2="2.74" layer="1"/>
+<rectangle x1="-1.3" y1="-4.185" x2="-0.6" y2="-3.51" layer="1"/>
+<rectangle x1="-4.4" y1="-9.11" x2="5.2" y2="-7.11" layer="1"/>
+</package>
+<package name="WEEE_BIN">
+<wire x1="-5" y1="-2.57" x2="6.5" y2="9.23" width="0.2" layer="25"/>
+<wire x1="-5.3" y1="9.13" x2="5.7" y2="-2.67" width="0.2" layer="25"/>
+<wire x1="1.6" y1="-0.97" x2="-1.1" y2="-0.97" width="0.2" layer="25"/>
+<wire x1="-1.1" y1="-0.97" x2="-1.4" y2="-0.67" width="0.2" layer="25" curve="-90"/>
+<wire x1="-1.4" y1="-0.67" x2="-2" y2="7.03" width="0.2" layer="25"/>
+<wire x1="-2" y1="7.03" x2="-2" y2="7.23" width="0.2" layer="25"/>
+<wire x1="-2" y1="7.23" x2="-1.7" y2="7.83" width="0.2" layer="25" curve="-53.130102"/>
+<wire x1="-1.7" y1="7.83" x2="-1.2" y2="8.03" width="0.2" layer="25" curve="-30.139189"/>
+<wire x1="-1.2" y1="8.03" x2="0.1" y2="8.13" width="0.2" layer="25" curve="-4.666241"/>
+<wire x1="0.1" y1="8.13" x2="0.1" y2="8.33" width="0.2" layer="25"/>
+<wire x1="0.1" y1="8.33" x2="1.4" y2="8.33" width="0.2" layer="25"/>
+<wire x1="1.4" y1="8.33" x2="1.4" y2="7.93" width="0.2" layer="25"/>
+<wire x1="1.4" y1="7.93" x2="0.1" y2="7.93" width="0.2" layer="25"/>
+<wire x1="0.1" y1="7.93" x2="0.1" y2="8.13" width="0.2" layer="25"/>
+<wire x1="1.5" y1="8.13" x2="1.6" y2="8.13" width="0.2" layer="25"/>
+<wire x1="1.6" y1="8.13" x2="2.5" y2="8.03" width="0.2" layer="25" curve="-12.680383"/>
+<wire x1="2.5" y1="8.03" x2="3.1" y2="7.63" width="0.2" layer="25" curve="-42.011125"/>
+<wire x1="3.1" y1="7.63" x2="3.2" y2="7.33" width="0.2" layer="25" curve="-33.736084"/>
+<wire x1="3.2" y1="7.33" x2="2.7" y2="0.63" width="0.2" layer="25"/>
+<wire x1="3.175" y1="5.33" x2="3.8" y2="5.33" width="0.2" layer="25"/>
+<wire x1="3.8" y1="5.33" x2="3.8" y2="6.355" width="0.2" layer="25"/>
+<wire x1="3.8" y1="6.355" x2="3.225" y2="6.355" width="0.2" layer="25"/>
+<wire x1="-1.3" y1="7.23" x2="-1.35" y2="8.13" width="0.2" layer="25"/>
+<wire x1="-1.35" y1="8.13" x2="-1.15" y2="8.13" width="0.2" layer="25" curve="-192.667806"/>
+<wire x1="-1.15" y1="8.13" x2="-1.2" y2="7.23" width="0.2" layer="25"/>
+<wire x1="-1.2" y1="7.23" x2="-1.3" y2="7.23" width="0.2" layer="25"/>
+<circle x="2.6" y="-0.645" radius="0.9013" width="0.2" layer="25"/>
+<circle x="3.65" y="7.38" radius="0.45" width="0.2" layer="25"/>
+<circle x="2.6" y="-0.645" radius="0.5" width="0.2" layer="25"/>
+<rectangle x1="-2.65" y1="6.955" x2="3.225" y2="7.38" layer="25"/>
+<rectangle x1="-0.05" y1="4.58" x2="1.975" y2="5.28" layer="25"/>
+<rectangle x1="-1.3" y1="-1.645" x2="-0.6" y2="-0.97" layer="25"/>
+<rectangle x1="-4.4" y1="-6.57" x2="5.2" y2="-4.57" layer="25"/>
+</package>
 </packages>
 </library>
 <library name="ldo">
@@ -2291,6 +2370,91 @@ for SMD auto placement equipment</description>
 </package>
 </packages>
 </library>
+<library name="SparkFun-Aesthetics">
+<description>&lt;h3&gt;SparkFun Electronics' preferred foot prints&lt;/h3&gt;
+In this library you'll find non-functional items- supply symbols, logos, notations, frame blocks, etc.&lt;br&gt;&lt;br&gt;
+We've spent an enormous amount of time creating and checking these footprints and parts, but it is the end user's responsibility to ensure correctness and suitablity for a given componet or application. If you enjoy using this library, please buy one of our products at www.sparkfun.com.
+&lt;br&gt;&lt;br&gt;
+&lt;b&gt;Licensing:&lt;/b&gt; Creative Commons ShareAlike 4.0 International - https://creativecommons.org/licenses/by-sa/4.0/ 
+&lt;br&gt;&lt;br&gt;
+You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
+<packages>
+<package name="OSHW-LOGO-M_COPPER">
+<polygon width="0.15" layer="1">
+<vertex x="0.6578" y="-1.588" curve="9.499253"/>
+<vertex x="0.9108" y="-1.4576"/>
+<vertex x="1.5392" y="-1.97"/>
+<vertex x="1.97" y="-1.5392"/>
+<vertex x="1.4576" y="-0.9108" curve="19.001165"/>
+<vertex x="1.6747" y="-0.3866"/>
+<vertex x="2.4814" y="-0.3047"/>
+<vertex x="2.4814" y="0.3047"/>
+<vertex x="1.6747" y="0.3866" curve="19.001165"/>
+<vertex x="1.4576" y="0.9108"/>
+<vertex x="1.97" y="1.5392"/>
+<vertex x="1.5392" y="1.97"/>
+<vertex x="0.9108" y="1.4576" curve="19.001165"/>
+<vertex x="0.3866" y="1.6747"/>
+<vertex x="0.3047" y="2.4814"/>
+<vertex x="-0.3047" y="2.4814"/>
+<vertex x="-0.3866" y="1.6747" curve="19.001165"/>
+<vertex x="-0.9108" y="1.4576"/>
+<vertex x="-1.5392" y="1.97"/>
+<vertex x="-1.97" y="1.5392"/>
+<vertex x="-1.4576" y="0.9108" curve="19.001165"/>
+<vertex x="-1.6747" y="0.3866"/>
+<vertex x="-2.4814" y="0.3047"/>
+<vertex x="-2.4814" y="-0.3047"/>
+<vertex x="-1.6747" y="-0.3866" curve="19.001165"/>
+<vertex x="-1.4576" y="-0.9108"/>
+<vertex x="-1.97" y="-1.5392"/>
+<vertex x="-1.5392" y="-1.97"/>
+<vertex x="-0.9108" y="-1.4576" curve="9.499253"/>
+<vertex x="-0.6578" y="-1.588"/>
+<vertex x="-0.299" y="-0.7218" curve="-67.507353"/>
+<vertex x="-0.7813" y="0" curve="-247.497552"/>
+<vertex x="0.299" y="-0.7218"/>
+</polygon>
+</package>
+<package name="OSHW-LOGO-M">
+<polygon width="0.15" layer="25">
+<vertex x="0.6578" y="-1.588" curve="9.499253"/>
+<vertex x="0.9108" y="-1.4576"/>
+<vertex x="1.5392" y="-1.97"/>
+<vertex x="1.97" y="-1.5392"/>
+<vertex x="1.4576" y="-0.9108" curve="19.001165"/>
+<vertex x="1.6747" y="-0.3866"/>
+<vertex x="2.4814" y="-0.3047"/>
+<vertex x="2.4814" y="0.3047"/>
+<vertex x="1.6747" y="0.3866" curve="19.001165"/>
+<vertex x="1.4576" y="0.9108"/>
+<vertex x="1.97" y="1.5392"/>
+<vertex x="1.5392" y="1.97"/>
+<vertex x="0.9108" y="1.4576" curve="19.001165"/>
+<vertex x="0.3866" y="1.6747"/>
+<vertex x="0.3047" y="2.4814"/>
+<vertex x="-0.3047" y="2.4814"/>
+<vertex x="-0.3866" y="1.6747" curve="19.001165"/>
+<vertex x="-0.9108" y="1.4576"/>
+<vertex x="-1.5392" y="1.97"/>
+<vertex x="-1.97" y="1.5392"/>
+<vertex x="-1.4576" y="0.9108" curve="19.001165"/>
+<vertex x="-1.6747" y="0.3866"/>
+<vertex x="-2.4814" y="0.3047"/>
+<vertex x="-2.4814" y="-0.3047"/>
+<vertex x="-1.6747" y="-0.3866" curve="19.001165"/>
+<vertex x="-1.4576" y="-0.9108"/>
+<vertex x="-1.97" y="-1.5392"/>
+<vertex x="-1.5392" y="-1.97"/>
+<vertex x="-0.9108" y="-1.4576" curve="9.499253"/>
+<vertex x="-0.6578" y="-1.588"/>
+<vertex x="-0.299" y="-0.7218" curve="-67.507353"/>
+<vertex x="-0.7813" y="0" curve="-247.497552"/>
+<vertex x="0.299" y="-0.7218"/>
+</polygon>
+</package>
+</packages>
+</library>
 </libraries>
 <attributes>
 <attribute name="VERSION" value="v2"/>
@@ -2514,7 +2678,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="CLASS" value="LED" x="12.7" y="77.8815" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="LINK" value="UNKNOWN LINK" x="12.7" y="77.8815" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="R18" library="rc-sysmocom" package="_0402" value="47" x="55.8165" y="28.4165" smashed="yes">
+<element name="R16" library="rc-sysmocom" package="_0402" value="47" x="55.8165" y="28.4165" smashed="yes">
 <attribute name="NAME" x="57.277" y="27.146" size="1" layer="25" font="vector" ratio="18" rot="R180"/>
 <attribute name="VALUE" x="54.229" y="26.9242" size="0.508" layer="27" font="vector" ratio="10"/>
 <attribute name="DESCRIPTION" value="RES SMD 47 OHM 5%% 1/10W 0603" x="55.8165" y="28.4165" size="1.778" layer="27" display="off"/>
@@ -2527,7 +2691,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="CLASS" value="RESISTOR" x="55.8165" y="28.4165" size="1.778" layer="27" display="off"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-0747RL/311-47GRCT-ND/729740" x="55.8165" y="28.4165" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R15" library="rc-sysmocom" package="_0402" value="47" x="55.84825" y="36.989" smashed="yes">
+<element name="R14" library="rc-sysmocom" package="_0402" value="47" x="55.84825" y="36.989" smashed="yes">
 <attribute name="NAME" x="51.27625" y="36.036" size="1" layer="25" font="vector" ratio="18" rot="R180"/>
 <attribute name="VALUE" x="54.26075" y="35.4967" size="0.508" layer="27" font="vector" ratio="10"/>
 <attribute name="DESCRIPTION" value="RES SMD 47 OHM 5%% 1/10W 0603" x="55.84825" y="36.989" size="1.778" layer="27" display="off"/>
@@ -2540,7 +2704,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="CLASS" value="RESISTOR" x="55.84825" y="36.989" size="1.778" layer="27" display="off"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-0747RL/311-47GRCT-ND/729740" x="55.84825" y="36.989" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R17" library="rc-sysmocom" package="_0402" value="47" x="55.84825" y="34.1315" smashed="yes">
+<element name="R15" library="rc-sysmocom" package="_0402" value="47" x="55.84825" y="34.1315" smashed="yes">
 <attribute name="NAME" x="51.27625" y="33.496" size="1" layer="25" font="vector" ratio="18" rot="R180"/>
 <attribute name="VALUE" x="54.26075" y="32.6392" size="0.508" layer="27" font="vector" ratio="10"/>
 <attribute name="DESCRIPTION" value="CRGCQ 0402 47R 1%%" x="55.84825" y="34.1315" size="1.778" layer="27" display="off"/>
@@ -2592,7 +2756,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="20.2565" y="42.16275" size="1" layer="25" font="vector" ratio="18" rot="R90"/>
 <attribute name="VALUE" x="18.288" y="40.95865" size="0.508" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="X3" library="Wurth_Elektronik_Electromechanic_DC_Power_Jack_Connectors_rev15c" package="694108106102" value="694108106102" x="-1.5" y="15.7785" smashed="yes">
+<element name="X5" library="Wurth_Elektronik_Electromechanic_DC_Power_Jack_Connectors_rev15c" package="694108106102" value="694108106102" x="-1.5" y="15.7785" smashed="yes">
 <attribute name="NAME" x="9.474140625" y="7.5811" size="1" layer="25" font="vector" ratio="18" rot="SR0"/>
 <attribute name="VALUE" x="-0.800359375" y="-4.3349" size="2.032" layer="27" font="vector" ratio="13" rot="SR0"/>
 <attribute name="DESCRIPTION" value="CONN PWR JACK 2.5X5.5MM SOLDER" x="-1.5" y="15.7785" size="1.778" layer="27" display="off"/>
@@ -2605,7 +2769,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="CLASS" value="RELAY" x="-1.5" y="15.7785" size="1.778" layer="27" display="off"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/wurth-electronics-inc/694108106102/732-5933-1-ND/5047628" x="-1.5" y="15.7785" size="1.778" layer="27" display="off"/>
 </element>
-<element name="X4" library="jumper" package="JP2" value="" x="3.6195" y="43.782" smashed="yes" rot="SR270">
+<element name="X6" library="jumper" package="JP2" value="" x="3.6195" y="43.782" smashed="yes" rot="SR270">
 <attribute name="DESCRIPTION" value="NO DESCRIPTION" x="3.6195" y="43.782" size="1.778" layer="27" rot="SR270" display="off"/>
 <attribute name="MANUFACTURER" value="UNKNOWN MANUFACTURER" x="3.6195" y="43.782" size="1.778" layer="27" rot="SR270" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="UNKNOWN MANUFACTURER PART NUMBER" x="3.6195" y="43.782" size="1.778" layer="27" rot="SR270" display="off"/>
@@ -2865,7 +3029,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="52.2605" y="47.2135" size="1" layer="25" font="vector" ratio="18" rot="R180"/>
 <attribute name="VALUE" x="56.9595" y="48.608" size="0.508" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
-<element name="R3" library="rc-sysmocom" package="_0603" value="330" x="12.7635" y="71.4045" smashed="yes" rot="R270">
+<element name="R2" library="rc-sysmocom" package="_0603" value="330" x="12.7635" y="71.4045" smashed="yes" rot="R270">
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-07330RL/311-330GRCT-ND/729716" x="12.7635" y="71.4045" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="RC0603JR-07330RL" x="12.7635" y="71.4045" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="ROHSCERTIFICATE" value="Bleifrei / RoHS-konform" x="12.7635" y="71.4045" size="1.778" layer="27" rot="R270" display="off"/>
@@ -2878,7 +3042,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="13.74775" y="66.87275" size="1" layer="25" font="vector" ratio="18" rot="R90"/>
 <attribute name="VALUE" x="11.2712" y="72.992" size="0.508" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="X5" library="laforge" package="SMA-F-S-TH" value="" x="80.264" y="18.89" smashed="yes" rot="R180">
+<element name="X7" library="laforge" package="SMA-F-S-TH" value="" x="80.264" y="18.89" smashed="yes" rot="R180">
 <attribute name="DESCRIPTION" value="CONN SMA JACK STR 50 OHM PCB" x="80.264" y="18.89" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MANUFACTURER" value="TE Connectivity AMP Connectors" x="80.264" y="18.89" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="5-1814832-1" x="80.264" y="18.89" size="1.778" layer="27" rot="R180" display="off"/>
@@ -2891,7 +3055,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="74.8665" y="22.065" size="1" layer="25" font="vector" ratio="18" rot="R180"/>
 <attribute name="VALUE" x="84.074" y="24.2875" size="1.27" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
-<element name="X6" library="laforge" package="SMA-F-S-TH" value="" x="69.469" y="6.19" smashed="yes" rot="R180">
+<element name="X8" library="laforge" package="SMA-F-S-TH" value="" x="69.469" y="6.19" smashed="yes" rot="R180">
 <attribute name="DESCRIPTION" value="CONN SMA JACK STR 50 OHM PCB" x="69.469" y="6.19" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MANUFACTURER" value="TE Connectivity AMP Connectors" x="69.469" y="6.19" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="5-1814832-1" x="69.469" y="6.19" size="1.778" layer="27" rot="R180" display="off"/>
@@ -2904,7 +3068,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="65.024" y="9.365" size="1" layer="25" font="vector" ratio="18" rot="R180"/>
 <attribute name="VALUE" x="73.279" y="11.5875" size="1.27" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
-<element name="X7" library="laforge" package="SMA-F-S-TH" value="" x="58.3565" y="19.337" smashed="yes" rot="R180">
+<element name="X9" library="laforge" package="SMA-F-S-TH" value="" x="58.3565" y="19.337" smashed="yes" rot="R180">
 <attribute name="DESCRIPTION" value="CONN SMA JACK STR 50 OHM PCB" x="58.3565" y="19.337" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MANUFACTURER" value="TE Connectivity AMP Connectors" x="58.3565" y="19.337" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="5-1814832-1" x="58.3565" y="19.337" size="1.778" layer="27" rot="R180" display="off"/>
@@ -2991,31 +3155,31 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="CLASS" value="CONNECTOR\JUMPER" x="39.1475" y="70.5" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="LINK" value="UNKNOWN LINK" x="39.1475" y="70.5" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C5" library="rc-sysmocom" package="_0603" value="100n" x="49.69" y="73.66" smashed="yes" rot="R90">
-<attribute name="DESCRIPTION" value="CAP CER 0.1UF 16V 10% X7R 0603" x="54.135" y="73.66" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="LINK" value="http://www.digikey.de/product-detail/de/foo/1276-1005-1-ND" x="54.135" y="73.66" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" value="CL10B104KO8NNNC" x="54.135" y="73.66" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="CLASS" value="CAPACITOR" x="54.135" y="73.66" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="POPULATED" value="TRUE" x="54.135" y="73.66" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="SOURCE" value="DIGIKEY" x="54.135" y="73.66" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="ROHSCERTIFICATE" value="Bleifrei / RoHS-konform" x="54.135" y="73.66" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="MANUFACTURER" value="Samsung Electro-Mechanics America, Inc" x="54.135" y="73.66" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="SOURCEPARTNUMBER" value="1276-1005-1-ND" x="54.135" y="73.66" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="NAME" x="51.1175" y="73.34125" size="1" layer="25" font="vector" ratio="18"/>
-<attribute name="VALUE" x="51.1823" y="72.0725" size="0.508" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C5" library="rc-sysmocom" package="_0603" value="100n" x="49.69" y="72.7075" smashed="yes" rot="R90">
+<attribute name="DESCRIPTION" value="CAP CER 0.1UF 16V 10% X7R 0603" x="54.135" y="72.7075" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="LINK" value="http://www.digikey.de/product-detail/de/foo/1276-1005-1-ND" x="54.135" y="72.7075" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" value="CL10B104KO8NNNC" x="54.135" y="72.7075" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="CLASS" value="CAPACITOR" x="54.135" y="72.7075" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="POPULATED" value="TRUE" x="54.135" y="72.7075" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="SOURCE" value="DIGIKEY" x="54.135" y="72.7075" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="ROHSCERTIFICATE" value="Bleifrei / RoHS-konform" x="54.135" y="72.7075" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="MANUFACTURER" value="Samsung Electro-Mechanics America, Inc" x="54.135" y="72.7075" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="SOURCEPARTNUMBER" value="1276-1005-1-ND" x="54.135" y="72.7075" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="NAME" x="51.1175" y="72.38875" size="1" layer="25" font="vector" ratio="18"/>
+<attribute name="VALUE" x="51.1823" y="71.12" size="0.508" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="R9" library="rc-sysmocom" package="_0603" value="330" x="50.4825" y="76.995" smashed="yes" rot="R180">
-<attribute name="DESCRIPTION" value="RES SMD 330 OHM 5%% 1/10W 0603" x="50.4825" y="76.995" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-07330RL/311-330GRCT-ND/729716" x="50.4825" y="76.995" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" value="RC0603JR-07330RL" x="50.4825" y="76.995" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="CLASS" value="RESISTOR" x="50.4825" y="76.995" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="POPULATED" value="TRUE" x="50.4825" y="76.995" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="SOURCE" value="DIGIKEY" x="50.4825" y="76.995" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="ROHSCERTIFICATE" value="Bleifrei / RoHS-konform" x="50.4825" y="76.995" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MANUFACTURER" value="Yageo" x="50.4825" y="76.995" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="SOURCEPARTNUMBER" value="311-330GRCT-ND" x="50.4825" y="76.995" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="NAME" x="51.1175" y="74.77" size="1" layer="25" font="vector" ratio="18"/>
-<attribute name="VALUE" x="52.07" y="78.4873" size="0.508" layer="27" font="vector" ratio="10" rot="R180"/>
+<element name="R8" library="rc-sysmocom" package="_0603" value="330" x="50.4825" y="75.725" smashed="yes" rot="R180">
+<attribute name="DESCRIPTION" value="RES SMD 330 OHM 5%% 1/10W 0603" x="50.4825" y="75.725" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-07330RL/311-330GRCT-ND/729716" x="50.4825" y="75.725" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" value="RC0603JR-07330RL" x="50.4825" y="75.725" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="CLASS" value="RESISTOR" x="50.4825" y="75.725" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="POPULATED" value="TRUE" x="50.4825" y="75.725" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="SOURCE" value="DIGIKEY" x="50.4825" y="75.725" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="ROHSCERTIFICATE" value="Bleifrei / RoHS-konform" x="50.4825" y="75.725" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="MANUFACTURER" value="Yageo" x="50.4825" y="75.725" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="SOURCEPARTNUMBER" value="311-330GRCT-ND" x="50.4825" y="75.725" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="NAME" x="51.1175" y="73.5" size="1" layer="25" font="vector" ratio="18"/>
+<attribute name="VALUE" x="52.07" y="77.2173" size="0.508" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
 <element name="R22" library="rc-sysmocom" package="_0603" value="330" x="8.095" y="70.325" smashed="yes" rot="R270">
 <attribute name="DESCRIPTION" value="RES SMD 330 OHM 5%% 1/10W 0603" x="8.095" y="70.325" size="1.778" layer="27" rot="R270" display="off"/>
@@ -3030,7 +3194,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="7.93625" y="68.57875" size="1" layer="25" font="vector" ratio="18" rot="R270"/>
 <attribute name="VALUE" x="6.6027" y="71.9125" size="0.508" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="R20" library="rc-sysmocom" package="_0402" value="47" x="56.83125" y="61.43625" smashed="yes" rot="R270">
+<element name="R18" library="rc-sysmocom" package="_0402" value="47" x="56.83125" y="61.43625" smashed="yes" rot="R270">
 <attribute name="DESCRIPTION" value="RES SMD 47 OHM 5%% 1/10W 0603" x="56.83125" y="61.43625" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-0747RL/311-47GRCT-ND/729740" x="56.83125" y="61.43625" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="RC0603JR-0747RL" x="56.83125" y="61.43625" size="1.778" layer="27" rot="R270" display="off"/>
@@ -3056,7 +3220,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="52.5475" y="66.04" size="1" layer="25" font="vector" ratio="18" rot="R90"/>
 <attribute name="VALUE" x="55.33895" y="65.88125" size="0.508" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="R16" library="rc-sysmocom" package="_0402" value="47" x="87.63125" y="59.84875" smashed="yes" rot="R90">
+<element name="R17" library="rc-sysmocom" package="_0402" value="47" x="87.63125" y="59.84875" smashed="yes" rot="R90">
 <attribute name="DESCRIPTION" value="RES SMD 47 OHM 5%% 1/10W 0603" x="87.63125" y="59.84875" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-0747RL/311-47GRCT-ND/729740" x="87.63125" y="59.84875" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="RC0603JR-0747RL" x="87.63125" y="59.84875" size="1.778" layer="27" rot="R90" display="off"/>
@@ -3146,7 +3310,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="19.84375" y="15.875" size="1" layer="25" font="vector" ratio="18"/>
 <attribute name="VALUE" x="23.01875" y="16.4148" size="0.508" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
-<element name="R8" library="rc-sysmocom" package="_0603" value="10k" x="28.2575" y="73.9775" smashed="yes" rot="R270">
+<element name="R7" library="rc-sysmocom" package="_0603" value="10k" x="28.2575" y="73.9775" smashed="yes" rot="R270">
 <attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/10W 0603" x="28.2575" y="73.9775" size="1.27" layer="27" ratio="16" rot="R270" display="off"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RMCF0603FT10K0/RMCF0603FT10K0CT-ND" x="28.2575" y="73.9775" size="1.27" layer="27" ratio="16" rot="R270" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="RMCF0603FT10K0" x="28.2575" y="73.9775" size="1.27" layer="27" ratio="16" rot="R270" display="off"/>
@@ -3159,7 +3323,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="30.00375" y="74.6125" size="1" layer="25" font="vector" ratio="18" rot="R90"/>
 <attribute name="VALUE" x="26.7652" y="75.565" size="0.508" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="R7" library="rc-sysmocom" package="_0603" value="10k" x="26.9875" y="70.485" smashed="yes" rot="R90">
+<element name="R6" library="rc-sysmocom" package="_0603" value="10k" x="26.9875" y="70.485" smashed="yes" rot="R90">
 <attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/10W 0603" x="26.9875" y="70.485" size="1.27" layer="27" ratio="16" rot="R90" display="off"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RMCF0603FT10K0/RMCF0603FT10K0CT-ND" x="26.9875" y="70.485" size="1.27" layer="27" ratio="16" rot="R90" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="RMCF0603FT10K0" x="26.9875" y="70.485" size="1.27" layer="27" ratio="16" rot="R90" display="off"/>
@@ -3172,7 +3336,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="27.78125" y="69.69125" size="1" layer="25" font="vector" ratio="18" rot="R270"/>
 <attribute name="VALUE" x="28.4798" y="68.8975" size="0.508" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="R12" library="rc-sysmocom" package="_0603" value="10k" x="21.59" y="70.8025" smashed="yes" rot="R90">
+<element name="R10" library="rc-sysmocom" package="_0603" value="10k" x="21.59" y="70.8025" smashed="yes" rot="R90">
 <attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/10W 0603" x="21.59" y="70.8025" size="1" layer="27" ratio="16" rot="R90" display="off"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RMCF0603FT10K0/RMCF0603FT10K0CT-ND" x="21.59" y="70.8025" size="1" layer="27" ratio="16" rot="R90" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="RMCF0603FT10K0" x="21.59" y="70.8025" size="1" layer="27" ratio="16" rot="R90" display="off"/>
@@ -3211,7 +3375,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="57.62625" y="55.245" size="1" layer="25" font="vector" ratio="18" rot="R270"/>
 <attribute name="VALUE" x="58.6423" y="55.245" size="0.508" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="D2" library="laforge" package="SOT666" value="PESD5V0UBV" x="54.61" y="58.7375" smashed="yes" rot="R180">
+<element name="D4" library="laforge" package="SOT666" value="PESD5V0UBV" x="54.61" y="58.7375" smashed="yes" rot="R180">
 <attribute name="DESCRIPTION" value="TVS DIODE 5V SOT666" x="58.1025" y="54.61" size="1" layer="27" ratio="16" rot="R180" display="off"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/nexperia-usa-inc/PESD5V0U5BV,115/1727-5806-1-ND" x="58.1025" y="54.61" size="1" layer="27" ratio="16" rot="R180" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="PESD5V0U5BV,115" x="58.1025" y="54.61" size="1" layer="27" ratio="16" rot="R180" display="off"/>
@@ -3239,7 +3403,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="46.796" y="36.001" size="1" layer="25" ratio="18" rot="R270"/>
 <attribute name="VALUE" x="51.9465" y="34.8015" size="0.4064" layer="27" rot="R90"/>
 </element>
-<element name="X8" library="USB30-MICROB" package="ZX360D-B" value="ZX360D-B-10P(30)" x="4.28625" y="66.19875" smashed="yes" rot="R270">
+<element name="X10" library="USB30-MICROB" package="ZX360D-B" value="ZX360D-B-10P(30)" x="4.28625" y="66.19875" smashed="yes" rot="R270">
 <attribute name="DESCRIPTION" value="CONN RCPT USB3.0 MICRO B SMD R/A" x="4.28625" y="66.19875" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURER" value="Hirose Electric Co Ltd" x="4.28625" y="66.19875" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="ZX360D-B-10P(30)" x="4.28625" y="66.19875" size="1.778" layer="27" rot="R270" display="off"/>
@@ -3304,7 +3468,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="12.22375" y="56.67375" size="1" layer="25" font="vector" ratio="18" rot="R270"/>
 <attribute name="VALUE" x="11.5252" y="60.6425" size="0.508" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="R2" library="rc-sysmocom" package="_0603" value="10k" x="14.76375" y="76.67625" smashed="yes" rot="R270">
+<element name="R3" library="rc-sysmocom" package="_0603" value="10k" x="14.76375" y="76.67625" smashed="yes" rot="R270">
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RMCF0603FT10K0/RMCF0603FT10K0CT-ND" x="14.76375" y="76.67625" size="1" layer="27" ratio="16" rot="R270" display="off"/>
 <attribute name="MANUFACTURER" value="Stackpole Electronics Inc" x="14.76375" y="76.67625" size="1" layer="27" ratio="16" rot="R270" display="off"/>
 <attribute name="POPULATED" value="TRUE" x="14.76375" y="76.67625" size="1" layer="27" ratio="16" rot="R270" display="off"/>
@@ -3356,7 +3520,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="74.4539" y="17.93875" size="1" layer="25" font="vector" ratio="18" rot="R270"/>
 <attribute name="VALUE" x="73.2789" y="20.79625" size="0.508" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="D4" library="diodes-sysmocom" package="SMBDIODE" value="SMBJP6KE6.8A-TP" x="4.445" y="36.195" smashed="yes">
+<element name="D3" library="diodes-sysmocom" package="SMBDIODE" value="SMBJP6KE6.8A-TP" x="4.445" y="36.195" smashed="yes">
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/micro-commercial-co/SMBJP6KE6.8A-TP/SMBJP6KE6.8A-TPMSCT-ND" x="-2.54" y="44.7675" size="1.016" layer="27" ratio="16" display="off"/>
 <attribute name="MANUFACTURER" value="Micro Commercial Co" x="-2.54" y="44.7675" size="1.016" layer="27" ratio="16" display="off"/>
 <attribute name="POPULATED" value="TRUE" x="-2.54" y="44.7675" size="1.016" layer="27" ratio="16" display="off"/>
@@ -3382,7 +3546,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="27.78125" y="14.2875" size="1" layer="25" font="vector" ratio="18" rot="R90"/>
 <attribute name="VALUE" x="28.7973" y="9.8425" size="0.508" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="D3" library="diodes-sysmocom" package="SMBDIODE" value="SD2114S040S5R0" x="3.4925" y="28.2575" smashed="yes" rot="R270">
+<element name="D2" library="diodes-sysmocom" package="SMBDIODE" value="SD2114S040S5R0" x="3.4925" y="28.2575" smashed="yes" rot="R270">
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/avx-corporation/SD2114S040S5R0/478-7816-1-ND" x="12.065" y="35.2425" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="MANUFACTURER" value="AVX Corporation" x="12.065" y="35.2425" size="1.778" layer="27" rot="R270" display="off"/>
 <attribute name="POPULATED" value="TRUE" x="12.065" y="35.2425" size="1.778" layer="27" rot="R270" display="off"/>
@@ -3395,7 +3559,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="4.445" y="23.8125" size="1" layer="25" ratio="18"/>
 <attribute name="VALUE" x="-0.3175" y="30.7975" size="1.016" layer="27" ratio="17" rot="R270"/>
 </element>
-<element name="JP1" library="laforge" package="2X10" value="" x="31.115" y="5.3975" smashed="yes">
+<element name="X3" library="laforge" package="2X10" value="" x="31.115" y="5.3975" smashed="yes">
 <attribute name="DESCRIPTION" value="NO DESCRIPTION" x="31.115" y="5.3975" size="1.778" layer="27" display="off"/>
 <attribute name="MANUFACTURER" value="UNKNOWN MANUFACTURER" x="31.115" y="5.3975" size="1.778" layer="27" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" value="UNKNOWN MANUFACTURER PART NUMBER" x="31.115" y="5.3975" size="1.778" layer="27" display="off"/>
@@ -3408,7 +3572,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="18.415" y="8.5725" size="1" layer="25" ratio="18"/>
 <attribute name="VALUE" x="18.415" y="0.9525" size="1.27" layer="27"/>
 </element>
-<element name="JP2" library="SparkFun" package="MICRO-FIDUCIAL" value="FIDUCIALUFIDUCIAL" x="48.895" y="64.4525" smashed="yes">
+<element name="JP1" library="SparkFun" package="MICRO-FIDUCIAL" value="FIDUCIALUFIDUCIAL" x="48.895" y="64.4525" smashed="yes">
 <attribute name="LINK" value="UNKNOWN LINK" x="48.895" y="65.0875" size="1.4224" layer="27" ratio="16" display="off"/>
 <attribute name="MANUFACTURER" value="UNKNOWN MANUFACTURER" x="48.895" y="65.0875" size="1.4224" layer="27" ratio="16" display="off"/>
 <attribute name="POPULATED" value="FALSE" x="48.895" y="65.0875" size="1.4224" layer="27" ratio="16" display="off"/>
@@ -3419,7 +3583,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="SOURCEPARTNUMBER" value="UNKNOWN SOURCE PART NUMBER" x="48.895" y="65.0875" size="1.4224" layer="27" ratio="16" display="off"/>
 <attribute name="ROHSCERTIFICATE" value="UNKNOWN ROHS CERTIFICATE" x="48.895" y="65.0875" size="1.4224" layer="27" ratio="16" display="off"/>
 </element>
-<element name="JP3" library="SparkFun" package="MICRO-FIDUCIAL" value="FIDUCIALUFIDUCIAL" x="26.3525" y="53.975" smashed="yes">
+<element name="JP2" library="SparkFun" package="MICRO-FIDUCIAL" value="FIDUCIALUFIDUCIAL" x="26.3525" y="53.975" smashed="yes">
 <attribute name="LINK" value="UNKNOWN LINK" x="26.3525" y="55.245" size="1.4224" layer="27" ratio="16" display="off"/>
 <attribute name="MANUFACTURER" value="UNKNOWN MANUFACTURER" x="26.3525" y="55.245" size="1.4224" layer="27" ratio="16" display="off"/>
 <attribute name="POPULATED" value="FALSE" x="26.3525" y="55.245" size="1.4224" layer="27" ratio="16" display="off"/>
@@ -3433,7 +3597,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <element name="FID3" library="dicons" package="VISION_REF15" value="" x="81.5" y="78" smashed="yes"/>
 <element name="FID1" library="dicons" package="VISION_REF15" value="" x="81.5" y="2.54" smashed="yes"/>
 <element name="FID2" library="dicons" package="VISION_REF15" value="" x="8.5" y="2.54" smashed="yes"/>
-<element name="R10" library="rc-sysmocom" package="_0603" value="100k" x="15.24" y="70.1675" smashed="yes" rot="R90">
+<element name="R9" library="rc-sysmocom" package="_0603" value="100k" x="15.24" y="70.1675" smashed="yes" rot="R90">
 <attribute name="SOURCE" value="DIGIKEY" x="15.24" y="70.1675" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="CLASS" value="RESISTOR" x="15.24" y="70.1675" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="MANUFACTURER" value="Vishay Dale" x="15.24" y="70.1675" size="1.778" layer="27" rot="R90" display="off"/>
@@ -3446,7 +3610,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="15.5575" y="68.58" size="1" layer="25" font="vector" ratio="18" rot="R270"/>
 <attribute name="VALUE" x="16.7323" y="68.58" size="0.508" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="R21" library="rc-sysmocom" package="_0603" value="4.7k" x="81.5975" y="71.12" smashed="yes">
+<element name="R20" library="rc-sysmocom" package="_0603" value="4.7k" x="81.5975" y="71.12" smashed="yes">
 <attribute name="SOURCE" value="DIGIKEY" x="81.5975" y="71.12" size="1.778" layer="27" display="off"/>
 <attribute name="CLASS" value="RESISTOR" x="81.5975" y="71.12" size="1.778" layer="27" display="off"/>
 <attribute name="MANUFACTURER" value="Yageo" x="81.5975" y="71.12" size="1.778" layer="27" display="off"/>
@@ -3459,7 +3623,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="79.6925" y="70.96125" size="1" layer="25" font="vector" ratio="18" rot="R180"/>
 <attribute name="VALUE" x="80.01" y="69.6277" size="0.508" layer="27" font="vector" ratio="10"/>
 </element>
-<element name="R14" library="rc-sysmocom" package="_0603" value="47k" x="55.88" y="66.675" smashed="yes">
+<element name="R21" library="rc-sysmocom" package="_0603" value="47k" x="55.88" y="66.675" smashed="yes">
 <attribute name="SOURCE" value="DIGIKEY" x="55.88" y="66.675" size="1.778" layer="27" display="off"/>
 <attribute name="CLASS" value="RESISTOR" x="55.88" y="66.675" size="1.778" layer="27" display="off"/>
 <attribute name="MANUFACTURER" value="Stackpole Electronics Inc" x="55.88" y="66.675" size="1.778" layer="27" display="off"/>
@@ -3485,7 +3649,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="89.05875" y="45.72" size="1" layer="25" font="vector" ratio="18" rot="R90"/>
 <attribute name="VALUE" x="85.8202" y="50.165" size="0.508" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="R6" library="rc-sysmocom" package="_0603" value="47k" x="55.245" y="40.3225" smashed="yes">
+<element name="R12" library="rc-sysmocom" package="_0603" value="47k" x="55.245" y="40.3225" smashed="yes">
 <attribute name="SOURCE" value="DIGIKEY" x="55.245" y="40.3225" size="1.778" layer="27" display="off"/>
 <attribute name="CLASS" value="RESISTOR" x="55.245" y="40.3225" size="1.778" layer="27" display="off"/>
 <attribute name="MANUFACTURER" value="Stackpole Electronics Inc" x="55.245" y="40.3225" size="1.778" layer="27" display="off"/>
@@ -3498,10 +3662,16 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="53.34" y="40.79875" size="1" layer="25" font="vector" ratio="18" rot="R180"/>
 <attribute name="VALUE" x="53.6575" y="38.8302" size="0.508" layer="27" font="vector" ratio="10"/>
 </element>
-<element name="X9" library="laforge" package="2X05" value="" x="67.31" y="48.26" smashed="yes">
+<element name="X4" library="laforge" package="2X05" value="" x="67.31" y="48.26" smashed="yes">
 <attribute name="NAME" x="74.93" y="48.895" size="1" layer="25" ratio="18"/>
 <attribute name="VALUE" x="60.96" y="43.815" size="1.27" layer="27"/>
 </element>
+<element name="U$1" library="laforge" package="WEEE_BIN_TOP" value="" x="80.3275" y="49.53" smashed="yes" rot="MR0"/>
+<element name="U$2" library="laforge" package="WEEE_BIN" value="" x="80.3275" y="46.99" smashed="yes" rot="MR0"/>
+<element name="U$5" library="SparkFun-Aesthetics" package="OSHW-LOGO-M_COPPER" value="" x="50.4825" y="5.3975"/>
+<element name="U$6" library="SparkFun-Aesthetics" package="OSHW-LOGO-M" value="" x="50.4825" y="5.3975" smashed="yes"/>
+<element name="U$3" library="SparkFun-Aesthetics" package="OSHW-LOGO-M_COPPER" value="" x="67.6275" y="66.9925" rot="MR0"/>
+<element name="U$4" library="SparkFun-Aesthetics" package="OSHW-LOGO-M" value="" x="67.6275" y="66.9925" smashed="yes" rot="MR0"/>
 </elements>
 <signals>
 <signal name="GND" class="3">
@@ -3509,8 +3679,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="U2" pad="2"/>
 <contactref element="C13" pad="1"/>
 <contactref element="C14" pad="1"/>
-<contactref element="X3" pad="3"/>
-<contactref element="X3" pad="2"/>
+<contactref element="X5" pad="3"/>
+<contactref element="X5" pad="2"/>
 <contactref element="C11" pad="-"/>
 <contactref element="C15" pad="-"/>
 <contactref element="C19" pad="2"/>
@@ -3534,10 +3704,10 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <vertex x="90.104" y="0.762"/>
 </polygon>
 <polygon width="0.4064" layer="16" rank="6">
-<vertex x="90.104" y="79.977"/>
-<vertex x="-0.254" y="79.977"/>
+<vertex x="90" y="80"/>
+<vertex x="0" y="80"/>
 <vertex x="-0.254" y="0.762"/>
-<vertex x="90.104" y="0.762"/>
+<vertex x="90.104" y="0.127"/>
 </polygon>
 <via x="13.5255" y="52.8625" extent="1-16" drill="0.3"/>
 <via x="5.612" y="10.6985" extent="1-16" drill="0.3"/>
@@ -3561,7 +3731,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="11.2395" y="55.1485" extent="1-16" drill="0.3"/>
 <via x="6.6675" y="55.1485" extent="1-16" drill="0.3"/>
 <via x="6.6675" y="52.89425" extent="1-16" drill="0.3"/>
-<via x="18.57375" y="51.30675" extent="1-16" drill="0.3"/>
 <contactref element="NGFF1" pad="39"/>
 <contactref element="NGFF1" pad="33"/>
 <contactref element="NGFF1" pad="57"/>
@@ -3581,7 +3750,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="D8" pad="10"/>
 <contactref element="C5" pad="1"/>
 <contactref element="R22" pad="1"/>
-<contactref element="R9" pad="1"/>
+<contactref element="R8" pad="1"/>
 <contactref element="SIM2" pad="5"/>
 <contactref element="C7" pad="2"/>
 <contactref element="C8" pad="2"/>
@@ -3599,7 +3768,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="11.557" y="60.70475" extent="1-16" drill="0.3"/>
 <via x="51.2125" y="58.768" extent="1-16" drill="0.3"/>
 <via x="87.09" y="64.483" extent="1-16" drill="0.3"/>
-<via x="86.7725" y="56.863" extent="1-16" drill="0.3"/>
+<via x="86.455" y="60.673" extent="1-16" drill="0.3"/>
 <via x="88.6775" y="65.4355" extent="1-16" drill="0.3"/>
 <via x="55.6575" y="53.053" extent="1-16" drill="0.3"/>
 <via x="57.5625" y="51.4655" extent="1-16" drill="0.3"/>
@@ -3608,7 +3777,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="87.725" y="40.6705" extent="1-16" drill="0.3"/>
 <via x="88.0425" y="34.638" extent="1-16" drill="0.3"/>
 <via x="51.2125" y="78.7705" extent="1-16" drill="0.3"/>
-<via x="51.2125" y="72.4205" extent="1-16" drill="0.3"/>
+<via x="52.4825" y="71.468" extent="1-16" drill="0.3"/>
 <via x="45.815" y="64.8005" extent="1-16" drill="0.3"/>
 <via x="45.33875" y="61.6255" extent="1-16" drill="0.3"/>
 <wire x1="45.6115" y1="63.2175" x2="45.6115" y2="64.6865" width="0.3048" layer="1"/>
@@ -3648,11 +3817,10 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="12.065" y="67.81675" extent="1-16" drill="0.3"/>
 <via x="67.405" y="52.7355" extent="1-16" drill="0.3"/>
 <via x="73.755" y="52.7355" extent="1-16" drill="0.3"/>
-<contactref element="D2" pad="2"/>
+<contactref element="D4" pad="2"/>
 <contactref element="D1" pad="2"/>
 <via x="54.35625" y="35.847" extent="1-16" drill="0.3"/>
 <via x="9.3345" y="55.1485" extent="1-16" drill="0.3"/>
-<via x="20.1295" y="52.291" extent="1-16" drill="0.3"/>
 <wire x1="41.6115" y1="63.2175" x2="41.6115" y2="64.407" width="0.3048" layer="1"/>
 <wire x1="41.6115" y1="64.407" x2="42.005" y2="64.8005" width="0.3048" layer="1"/>
 <wire x1="40.1115" y1="63.2175" x2="40.1115" y2="64.65325" width="0.3048" layer="1"/>
@@ -3719,8 +3887,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="70.2625" y="23.5255" extent="1-16" drill="0.3"/>
 <via x="67.0875" y="12.0955" extent="1-16" drill="0.3"/>
 <via x="72.1675" y="12.0955" extent="1-16" drill="0.3"/>
-<contactref element="X8" pad="8"/>
-<contactref element="X8" pad="5"/>
+<contactref element="X10" pad="8"/>
+<contactref element="X10" pad="5"/>
 <via x="1.11125" y="71.7855" extent="1-16" drill="0.3"/>
 <via x="9.36625" y="72.4205" extent="1-16" drill="0.3"/>
 <wire x1="4.28625" y1="59.49875" x2="6.0325" y2="59.49875" width="0.4064" layer="1"/>
@@ -3734,7 +3902,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="14.605" y="62.503" extent="1-16" drill="0.3"/>
 <via x="18.7325" y="66.6305" extent="1-16" drill="0.3"/>
 <via x="34.385" y="10.1905" extent="1-16" drill="0.3"/>
-<via x="35.655" y="13.3655" extent="1-16" drill="0.3"/>
 <via x="52.8" y="16.858" extent="1-16" drill="0.3"/>
 <via x="19.145" y="23.208" extent="1-16" drill="0.3"/>
 <via x="17.5575" y="29.2405" extent="1-16" drill="0.3"/>
@@ -3769,24 +3936,24 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="56.2925" y="58.92675" extent="1-16" drill="0.3"/>
 <wire x1="54.61" y1="58.7375" x2="54.61" y2="59.6375" width="0.3048" layer="1"/>
 <via x="55.81625" y="62.73675" extent="1-16" drill="0.3"/>
-<contactref element="X5" pad="G1"/>
-<contactref element="X5" pad="G2"/>
-<contactref element="X5" pad="G3"/>
-<contactref element="X5" pad="G4"/>
-<contactref element="Y1" pad="P$1"/>
-<contactref element="Y1" pad="P$2"/>
-<contactref element="Y1" pad="P$4"/>
 <contactref element="X7" pad="G1"/>
 <contactref element="X7" pad="G2"/>
 <contactref element="X7" pad="G3"/>
 <contactref element="X7" pad="G4"/>
+<contactref element="Y1" pad="P$1"/>
+<contactref element="Y1" pad="P$2"/>
+<contactref element="Y1" pad="P$4"/>
+<contactref element="X9" pad="G1"/>
+<contactref element="X9" pad="G2"/>
+<contactref element="X9" pad="G3"/>
+<contactref element="X9" pad="G4"/>
 <contactref element="Y3" pad="P$1"/>
 <contactref element="Y3" pad="P$2"/>
 <contactref element="Y3" pad="P$4"/>
-<contactref element="X6" pad="G1"/>
-<contactref element="X6" pad="G4"/>
-<contactref element="X6" pad="G3"/>
-<contactref element="X6" pad="G2"/>
+<contactref element="X8" pad="G1"/>
+<contactref element="X8" pad="G4"/>
+<contactref element="X8" pad="G3"/>
+<contactref element="X8" pad="G2"/>
 <contactref element="Y2" pad="P$1"/>
 <contactref element="Y2" pad="P$2"/>
 <contactref element="Y2" pad="P$4"/>
@@ -3808,7 +3975,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="75.9775" y="17.96925" extent="1-16" drill="0.3"/>
 <via x="71.85" y="21.303" extent="1-16" drill="0.3"/>
 <contactref element="U2" pad="4"/>
-<contactref element="D4" pad="A"/>
+<contactref element="D3" pad="A"/>
 <via x="12.319" y="31.3995" extent="1-16" drill="0.3"/>
 <via x="21.5265" y="26.002" extent="1-16" drill="0.3"/>
 <polygon width="0.4064" layer="1" thermals="no">
@@ -3819,7 +3986,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </polygon>
 <via x="17.5575" y="23.208" extent="1-16" drill="0.3"/>
 <via x="16.129" y="25.367" extent="1-16" drill="0.3"/>
-<via x="12.319" y="26.3195" extent="1-16" drill="0.3"/>
+<via x="12.319" y="25.6845" extent="1-16" drill="0.3"/>
 <via x="12.319" y="30.1295" extent="1-16" drill="0.3"/>
 <via x="6.7625" y="33.368" extent="1-16" drill="0.3"/>
 <via x="7.3975" y="38.7655" extent="1-16" drill="0.3"/>
@@ -3829,7 +3996,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="16.28775" y="41.877" extent="1-16" drill="0.3"/>
 <via x="13.43025" y="41.877" extent="1-16" drill="0.3"/>
 <via x="10.89025" y="41.877" extent="1-16" drill="0.3"/>
-<contactref element="JP1" pad="2"/>
+<contactref element="X3" pad="2"/>
 <polygon width="0.254" layer="1" thermals="no">
 <vertex x="73.025" y="20.6375"/>
 <vertex x="70.1675" y="20.6375"/>
@@ -3890,11 +4057,71 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="41.6115" y1="63.2175" x2="41.6115" y2="62.249" width="0.254" layer="1"/>
 <wire x1="41.6115" y1="62.249" x2="41.275" y2="61.9125" width="0.254" layer="1"/>
 <via x="42.64" y="1.9355" extent="1-16" drill="0.3"/>
-<contactref element="R10" pad="1"/>
-<contactref element="R6" pad="1"/>
-<contactref element="R14" pad="1"/>
+<contactref element="R9" pad="1"/>
+<contactref element="R12" pad="1"/>
+<contactref element="R21" pad="1"/>
 <wire x1="38.5125" y1="67.3405" x2="40.005" y2="65.0875" width="0.254" layer="1"/>
 <via x="56.61" y="44.4805" extent="1-16" drill="0.3"/>
+<via x="34.9885" y="33.4315" extent="1-16" drill="0.3"/>
+<via x="41.021" y="39.7815" extent="1-16" drill="0.3"/>
+<via x="34.9885" y="24.859" extent="1-16" drill="0.3"/>
+<via x="41.021" y="28.3515" extent="1-16" drill="0.3"/>
+<via x="41.021" y="16.9215" extent="1-16" drill="0.3"/>
+<via x="26.416" y="50.259" extent="1-16" drill="0.3"/>
+<via x="64.1985" y="77.8815" extent="1-16" drill="0.3"/>
+<via x="73.0885" y="77.8815" extent="1-16" drill="0.3"/>
+<via x="55.3085" y="68.9915" extent="1-16" drill="0.3"/>
+<via x="71.8185" y="67.7215" extent="1-16" drill="0.3"/>
+<via x="78.1685" y="67.7215" extent="1-16" drill="0.3"/>
+<via x="78.1685" y="63.9115" extent="1-16" drill="0.3"/>
+<via x="78.8035" y="56.9265" extent="1-16" drill="0.3"/>
+<via x="78.1685" y="43.5915" extent="1-16" drill="0.3"/>
+<via x="71.8185" y="42.3215" extent="1-16" drill="0.3"/>
+<via x="78.1685" y="38.5115" extent="1-16" drill="0.3"/>
+<via x="62.9285" y="30.8915" extent="1-16" drill="0.3"/>
+<via x="62.9285" y="38.5115" extent="1-16" drill="0.3"/>
+<via x="81.9785" y="30.8915" extent="1-16" drill="0.3"/>
+<via x="48.641" y="30.8915" extent="1-16" drill="0.3"/>
+<via x="48.641" y="25.8115" extent="1-16" drill="0.3"/>
+<via x="48.641" y="20.7315" extent="1-16" drill="0.3"/>
+<via x="48.641" y="15.6515" extent="1-16" drill="0.3"/>
+<via x="48.641" y="9.3015" extent="1-16" drill="0.3"/>
+<via x="46.101" y="5.4915" extent="1-16" drill="0.3"/>
+<via x="13.081" y="6.7615" extent="1-16" drill="0.3"/>
+<via x="39.62375" y="57.65675" extent="1-16" drill="0.3"/>
+<via x="49.14875" y="62.73675" extent="1-16" drill="0.3"/>
+<via x="49.14875" y="66.54675" extent="1-16" drill="0.3"/>
+<via x="53.59375" y="66.54675" extent="1-16" drill="0.3"/>
+<via x="52.95875" y="61.46675" extent="1-16" drill="0.3"/>
+<via x="62.9285" y="67.7215" extent="1-16" drill="0.3"/>
+<via x="66.1035" y="62.0065" extent="1-16" drill="0.3"/>
+<via x="61.6585" y="62.0065" extent="1-16" drill="0.3"/>
+<via x="73.7235" y="62.0065" extent="1-16" drill="0.3"/>
+<via x="61.6585" y="55.6565" extent="1-16" drill="0.3"/>
+<via x="64.8335" y="55.6565" extent="1-16" drill="0.3"/>
+<via x="70.5485" y="55.6565" extent="1-16" drill="0.3"/>
+<via x="62.9285" y="34.7015" extent="1-16" drill="0.3"/>
+<via x="71.8185" y="38.5115" extent="1-16" drill="0.3"/>
+<via x="71.8185" y="34.7015" extent="1-16" drill="0.3"/>
+<via x="71.8185" y="30.8915" extent="1-16" drill="0.3"/>
+<via x="78.1685" y="34.7015" extent="1-16" drill="0.3"/>
+<via x="34.385" y="14.953" extent="1-16" drill="0.3"/>
+<via x="5.3975" y="50.35425" extent="1-16" drill="0.3"/>
+<via x="19.3675" y="50.35425" extent="1-16" drill="0.3"/>
+<via x="19.3675" y="52.25925" extent="1-16" drill="0.3"/>
+<via x="30.226" y="35.654" extent="1-16" drill="0.3"/>
+<via x="30.226" y="41.6865" extent="1-16" drill="0.3"/>
+<via x="34.671" y="46.1315" extent="1-16" drill="0.3"/>
+<via x="39.116" y="46.1315" extent="1-16" drill="0.3"/>
+<via x="39.116" y="44.2265" extent="1-16" drill="0.3"/>
+<via x="37.211" y="49.9415" extent="1-16" drill="0.3"/>
+<via x="34.671" y="40.099" extent="1-16" drill="0.3"/>
+<via x="22.606" y="46.449" extent="1-16" drill="0.3"/>
+<via x="29.94" y="78.7705" extent="1-16" drill="0.3"/>
+<via x="32.7975" y="77.5005" extent="1-16" drill="0.3"/>
+<via x="45.4975" y="77.5005" extent="1-16" drill="0.3"/>
+<via x="38.83" y="77.5005" extent="1-16" drill="0.3"/>
+<via x="63.5635" y="42.639" extent="1-16" drill="0.3"/>
 </signal>
 <signal name="USIM1_POWER">
 <contactref element="SIM1" pad="1"/>
@@ -3932,7 +4159,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="USIM1_DATA">
 <contactref element="SIM1" pad="7"/>
-<contactref element="R18" pad="2"/>
+<contactref element="R16" pad="2"/>
 <contactref element="C4" pad="1"/>
 <wire x1="85.2335" y1="36.83" x2="85.1435" y2="36.74" width="0.4064" layer="1"/>
 <wire x1="56.3245" y1="28.4165" x2="76.6765" y2="28.4165" width="0.4064" layer="1"/>
@@ -3946,7 +4173,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="USIM1_CLK">
 <contactref element="SIM1" pad="3"/>
-<contactref element="R15" pad="2"/>
+<contactref element="R14" pad="2"/>
 <contactref element="C3" pad="1"/>
 <wire x1="59.4435" y1="36.74" x2="59.1945" y2="36.989" width="0.4064" layer="1"/>
 <wire x1="56.35625" y1="36.989" x2="56.35625" y2="38.194" width="0.3048" layer="1"/>
@@ -3954,7 +4181,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="!USIM1_RESET">
 <contactref element="SIM1" pad="2"/>
-<contactref element="R17" pad="2"/>
+<contactref element="R15" pad="2"/>
 <contactref element="C2" pad="1"/>
 <wire x1="59.4435" y1="34.2" x2="59.375" y2="34.1315" width="0.4064" layer="1"/>
 <wire x1="59.375" y1="34.1315" x2="56.35625" y2="34.1315" width="0.4064" layer="1"/>
@@ -4045,7 +4272,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="16.51" y="33.655" extent="1-16" drill="0.3"/>
 <via x="16.51" y="36.195" extent="1-16" drill="0.3"/>
 <via x="19.05" y="36.195" extent="1-16" drill="0.3"/>
-<contactref element="JP1" pad="1"/>
+<contactref element="X3" pad="1"/>
 </signal>
 <signal name="!RESET">
 <contactref element="NGFF1" pad="67"/>
@@ -4059,7 +4286,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="44.1115" y1="63.2175" x2="44.1115" y2="64.114" width="0.3048" layer="1"/>
 <wire x1="44.1115" y1="64.114" x2="45.085" y2="65.0875" width="0.3048" layer="1"/>
 <wire x1="45.085" y1="65.0875" x2="45.085" y2="66.04" width="0.3048" layer="1"/>
-<contactref element="R8" pad="1"/>
+<contactref element="R7" pad="1"/>
 <wire x1="33.9725" y1="63.1825" x2="27.55775" y2="69.59725" width="0.3048" layer="16"/>
 <contactref element="X1" pad="7"/>
 <wire x1="25.0825" y1="74.93" x2="26.3525" y2="74.93" width="0.6" layer="1"/>
@@ -4080,7 +4307,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="26.67" y1="60.0075" x2="21.59" y2="65.0875" width="0.3048" layer="16"/>
 <wire x1="21.59" y1="65.0875" x2="21.59" y2="71.12" width="0.3048" layer="16"/>
 <wire x1="21.59" y1="71.12" x2="20.12825" y2="72.58175" width="0.3048" layer="16"/>
-<contactref element="R12" pad="1"/>
+<contactref element="R10" pad="1"/>
 <wire x1="21.59" y1="70.0405" x2="21.7805" y2="70.1675" width="0.3048" layer="1"/>
 <wire x1="21.7805" y1="70.1675" x2="20.955" y2="70.1675" width="0.3048" layer="1"/>
 <wire x1="20.955" y1="70.1675" x2="20.12825" y2="70.99425" width="0.3048" layer="1"/>
@@ -4092,7 +4319,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="20.0025" y1="72.517" x2="20.0025" y2="74.93" width="0.6" layer="1"/>
 </signal>
 <signal name="_USIM1_DATA">
-<contactref element="R18" pad="1"/>
+<contactref element="R16" pad="1"/>
 <contactref element="NGFF1" pad="34"/>
 <wire x1="55.3085" y1="28.4165" x2="54.1335" y2="28.4165" width="0.3048" layer="1"/>
 <wire x1="35.8615" y1="55.6675" x2="35.8615" y2="51.1335" width="0.3048" layer="1"/>
@@ -4114,7 +4341,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="49.8475" y1="44.1325" x2="43.18" y2="50.8" width="0.3048" layer="16"/>
 </signal>
 <signal name="_!USIM1_RESET">
-<contactref element="R17" pad="1"/>
+<contactref element="R15" pad="1"/>
 <contactref element="NGFF1" pad="30"/>
 <wire x1="55.34025" y1="34.1315" x2="54.4565" y2="34.1315" width="0.3048" layer="1"/>
 <wire x1="34.8615" y1="55.6675" x2="34.8615" y2="48.9585" width="0.3048" layer="1"/>
@@ -4135,14 +4362,14 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="R22" pad="2"/>
 <wire x1="8.725" y1="69.558" x2="8.095" y2="69.563" width="0.5" layer="1"/>
 <wire x1="8.095" y1="69.563" x2="9.431" y2="69.563" width="1.016" layer="1"/>
-<contactref element="X8" pad="S1"/>
-<contactref element="X8" pad="S8"/>
-<contactref element="X8" pad="S5"/>
-<contactref element="X8" pad="S4"/>
-<contactref element="X8" pad="S7"/>
-<contactref element="X8" pad="S3"/>
-<contactref element="X8" pad="S2"/>
-<contactref element="X8" pad="S6"/>
+<contactref element="X10" pad="S1"/>
+<contactref element="X10" pad="S8"/>
+<contactref element="X10" pad="S5"/>
+<contactref element="X10" pad="S4"/>
+<contactref element="X10" pad="S7"/>
+<contactref element="X10" pad="S3"/>
+<contactref element="X10" pad="S2"/>
+<contactref element="X10" pad="S6"/>
 <wire x1="4.28625" y1="56.8325" x2="1.7025" y2="56.8325" width="1.016" layer="1"/>
 <wire x1="1.7025" y1="56.8325" x2="1.43625" y2="57.09875" width="0.6" layer="1"/>
 <wire x1="1.43625" y1="57.09875" x2="1.43625" y2="59.52375" width="1.778" layer="1"/>
@@ -4161,7 +4388,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="U2" pad="1"/>
 <contactref element="C13" pad="2"/>
 <contactref element="C11" pad="+"/>
-<contactref element="X4" pad="2"/>
+<contactref element="X6" pad="2"/>
 <polygon width="0.3048" layer="1" isolate="0.3048" thermals="no">
 <vertex x="6.6675" y="26.9875"/>
 <vertex x="6.6675" y="29.5275"/>
@@ -4184,9 +4411,9 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="8.255" y="29.05125" extent="1-16" drill="0.3"/>
 </signal>
 <signal name="N$12" class="3">
-<contactref element="X4" pad="3"/>
+<contactref element="X6" pad="3"/>
+<contactref element="D2" pad="C"/>
 <contactref element="D3" pad="C"/>
-<contactref element="D4" pad="C"/>
 <wire x1="2.667" y1="31.113" x2="3.4925" y2="30.2875" width="0.4064" layer="1"/>
 <polygon width="0.3048" layer="1" isolate="0.3048" thermals="no">
 <vertex x="0.635" y="41.91"/>
@@ -4200,7 +4427,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </polygon>
 </signal>
 <signal name="USB_VBUS" class="3">
-<contactref element="X4" pad="1"/>
+<contactref element="X6" pad="1"/>
 <wire x1="3.6195" y1="46.322" x2="2.8575" y2="48.354" width="1.4224" layer="1"/>
 <wire x1="2.8575" y1="48.354" x2="2.8575" y2="50.894" width="1.4224" layer="1"/>
 <via x="2.8575" y="50.894" extent="1-16" drill="0.3"/>
@@ -4217,7 +4444,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="4.28625" y1="67.78625" x2="2.8575" y2="66.04" width="1.4224" layer="16"/>
 <wire x1="2.8575" y1="66.04" x2="2.8575" y2="63.0225" width="1.4224" layer="16"/>
 <wire x1="6.1925" y1="67.78625" x2="6.985" y2="67.78625" width="1.4224" layer="16"/>
-<contactref element="X8" pad="1"/>
+<contactref element="X10" pad="1"/>
 <wire x1="6.1925" y1="67.78625" x2="5.5875" y2="67.49875" width="0.4064" layer="1"/>
 <wire x1="5.5875" y1="67.49875" x2="4.28625" y2="67.49875" width="0.4064" layer="1"/>
 <polygon width="0.1524" layer="1" thermals="no">
@@ -4250,7 +4477,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="43.3615" y1="55.6675" x2="43.3615" y2="13.834" width="0.3048" layer="1"/>
 <wire x1="43.3615" y1="13.834" x2="37.5285" y2="8.001" width="0.3048" layer="1"/>
 <wire x1="37.5285" y1="8.001" x2="37.465" y2="7.9375" width="0.6096" layer="1"/>
-<contactref element="JP1" pad="16"/>
+<contactref element="X3" pad="16"/>
 <wire x1="37.465" y1="7.9375" x2="37.465" y2="6.6675" width="0.6096" layer="1"/>
 </signal>
 <signal name="COEX2">
@@ -4259,7 +4486,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="36.195" y1="5.3975" x2="36.195" y2="8.255" width="0.3048" layer="1"/>
 <wire x1="36.195" y1="8.255" x2="42.8615" y2="14.9215" width="0.3048" layer="1"/>
 <wire x1="42.8615" y1="14.9215" x2="42.8615" y2="55.6675" width="0.3048" layer="1"/>
-<contactref element="JP1" pad="13"/>
+<contactref element="X3" pad="13"/>
 <wire x1="34.9885" y1="4.191" x2="34.925" y2="4.1275" width="0.254" layer="1"/>
 </signal>
 <signal name="!CLKREQ">
@@ -4272,7 +4499,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="29.9085" y1="4.191" x2="31.115" y2="5.3975" width="0.6" layer="1"/>
 <wire x1="31.115" y1="5.3975" x2="31.115" y2="9.8425" width="0.3048" layer="1"/>
 <wire x1="31.115" y1="9.8425" x2="31.4325" y2="10.16" width="0.3048" layer="1"/>
-<contactref element="JP1" pad="9"/>
+<contactref element="X3" pad="9"/>
 <wire x1="29.9085" y1="4.191" x2="29.845" y2="4.1275" width="0.254" layer="1"/>
 </signal>
 <signal name="PCM_CLK">
@@ -4284,7 +4511,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="24.2415" y1="9.954" x2="23.495" y2="9.2075" width="0.3048" layer="1"/>
 <via x="23.495" y="9.2075" extent="1-16" drill="0.3"/>
 <wire x1="23.495" y1="9.2075" x2="23.495" y2="5.461" width="0.3048" layer="16"/>
-<contactref element="JP1" pad="5"/>
+<contactref element="X3" pad="5"/>
 <wire x1="24.765" y1="4.1275" x2="23.495" y2="5.3975" width="0.6096" layer="16"/>
 <wire x1="23.495" y1="5.3975" x2="23.495" y2="5.461" width="0.6096" layer="16"/>
 <wire x1="31.70275" y1="54.24525" x2="31.70275" y2="51.229" width="0.3048" layer="1"/>
@@ -4298,7 +4525,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="25.3765" y1="9.5015" x2="23.495" y2="7.62" width="0.3048" layer="1"/>
 <wire x1="23.495" y1="7.62" x2="23.495" y2="5.334" width="0.3048" layer="1"/>
 <wire x1="23.495" y1="5.334" x2="22.2885" y2="4.1275" width="0.6096" layer="1"/>
-<contactref element="JP1" pad="3"/>
+<contactref element="X3" pad="3"/>
 <wire x1="22.225" y1="4.1275" x2="22.2885" y2="4.1275" width="0.254" layer="1"/>
 </signal>
 <signal name="PCM_DOUT">
@@ -4313,7 +4540,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="27.305" y1="9.2075" x2="27.305" y2="8.89" width="0.3048" layer="16"/>
 <wire x1="27.305" y1="8.89" x2="26.035" y2="7.62" width="0.3048" layer="16"/>
 <wire x1="26.035" y1="7.62" x2="26.035" y2="5.461" width="0.3048" layer="16"/>
-<contactref element="JP1" pad="7"/>
+<contactref element="X3" pad="7"/>
 <wire x1="27.305" y1="4.1275" x2="26.035" y2="5.3975" width="0.6096" layer="16"/>
 <wire x1="26.035" y1="5.3975" x2="26.035" y2="5.461" width="0.6096" layer="16"/>
 </signal>
@@ -4324,7 +4551,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="28.8925" y1="42.2275" x2="28.8925" y2="9.5965" width="0.3048" layer="1"/>
 <wire x1="27.3685" y1="8.0725" x2="28.8925" y2="9.5965" width="0.3048" layer="1"/>
 <wire x1="27.3685" y1="8.0725" x2="27.3185" y2="8.0225" width="0.6096" layer="1"/>
-<contactref element="JP1" pad="8"/>
+<contactref element="X3" pad="8"/>
 <wire x1="27.305" y1="6.6675" x2="27.3185" y2="6.681" width="0.6096" layer="1"/>
 <wire x1="27.3185" y1="6.681" x2="27.3185" y2="8.0225" width="0.6096" layer="1"/>
 <wire x1="34.3615" y1="54.364" x2="33.9725" y2="53.975" width="0.3048" layer="1"/>
@@ -4336,7 +4563,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="41.3615" y1="42.949" x2="32.385" y2="33.9725" width="0.3048" layer="1"/>
 <wire x1="32.385" y1="33.9725" x2="32.385" y2="7.9375" width="0.3048" layer="1"/>
 <wire x1="32.385" y1="6.731" x2="32.385" y2="7.9375" width="0.6" layer="1"/>
-<contactref element="JP1" pad="12"/>
+<contactref element="X3" pad="12"/>
 <wire x1="32.385" y1="6.731" x2="32.385" y2="6.6675" width="0.254" layer="1"/>
 </signal>
 <signal name="SMB_CLK">
@@ -4348,14 +4575,14 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="33.655" y1="8.5725" x2="33.655" y2="5.4475" width="0.3048" layer="1"/>
 <wire x1="33.605" y1="5.3975" x2="33.655" y2="5.4475" width="0.3048" layer="1"/>
 <wire x1="33.605" y1="5.3975" x2="32.3985" y2="4.191" width="0.6096" layer="1"/>
-<contactref element="JP1" pad="11"/>
+<contactref element="X3" pad="11"/>
 <wire x1="32.385" y1="4.1275" x2="32.3985" y2="4.141" width="0.254" layer="1"/>
 <wire x1="32.3985" y1="4.141" x2="32.3985" y2="4.191" width="0.254" layer="1"/>
 </signal>
 <signal name="_USB_D_N" class="1">
 <contactref element="NGFF1" pad="9"/>
 <contactref element="D8" pad="14"/>
-<contactref element="X8" pad="2"/>
+<contactref element="X10" pad="2"/>
 <wire x1="4.28625" y1="66.84875" x2="5.3975" y2="66.84875" width="0.4064" layer="1"/>
 <wire x1="29.6115" y1="63.2175" x2="29.6115" y2="64.109784375" width="0.18" layer="1"/>
 <wire x1="29.6115" y1="64.109784375" x2="29.02155" y2="65.53405" width="0.18" layer="1" curve="45"/>
@@ -4374,7 +4601,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <signal name="_USB_D_P" class="1">
 <contactref element="NGFF1" pad="7"/>
 <contactref element="D8" pad="13"/>
-<contactref element="X8" pad="3"/>
+<contactref element="X10" pad="3"/>
 <wire x1="4.28625" y1="66.19875" x2="4.61216875" y2="66.33375" width="0.18" layer="1" curve="-45"/>
 <wire x1="4.61216875" y1="66.33375" x2="5.835221875" y2="66.33375" width="0.18" layer="1"/>
 <wire x1="4.28625" y1="66.19875" x2="5.3975" y2="66.19875" width="0.4064" layer="1"/>
@@ -4400,13 +4627,13 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="N$2">
 <contactref element="LED1" pad="C"/>
-<contactref element="R3" pad="1"/>
+<contactref element="R2" pad="1"/>
 <wire x1="12.7" y1="77.1315" x2="12.7" y2="72.39" width="0.3048" layer="1"/>
 <wire x1="12.7" y1="72.39" x2="12.7635" y2="72.3265" width="0.3048" layer="1"/>
 <wire x1="12.7635" y1="72.3265" x2="12.7635" y2="72.1665" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$13" class="2">
-<contactref element="X5" pad="C"/>
+<contactref element="X7" pad="C"/>
 <contactref element="Y1" pad="1"/>
 <wire x1="72.7075" y1="18.89" x2="74.6125" y2="18.89" width="0.18" layer="1"/>
 <wire x1="74.6125" y1="18.89" x2="78.58" y2="18.89" width="0.18" layer="1"/>
@@ -4415,7 +4642,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="74.6125" y1="19.01825" x2="74.6125" y2="18.89" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$14" class="2">
-<contactref element="X6" pad="C"/>
+<contactref element="X8" pad="C"/>
 <contactref element="Y2" pad="1"/>
 <wire x1="62.23" y1="6.19" x2="64.135" y2="6.19" width="0.18" layer="1"/>
 <wire x1="64.135" y1="6.19" x2="69.469" y2="6.19" width="0.18" layer="1"/>
@@ -4424,7 +4651,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="64.135" y1="6.06425" x2="64.135" y2="6.19" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$7" class="2">
-<contactref element="X7" pad="C"/>
+<contactref element="X9" pad="C"/>
 <contactref element="Y3" pad="1"/>
 <wire x1="58.3565" y1="19.337" x2="58.3565" y2="13.97" width="0.18" layer="1"/>
 <wire x1="58.3565" y1="13.97" x2="58.3565" y2="12.2885" width="0.18" layer="1"/>
@@ -4437,7 +4664,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <signal name="USB3.0_TX_N" class="1">
 <contactref element="NGFF1" pad="29"/>
 <contactref element="D8" pad="12"/>
-<contactref element="X8" pad="6"/>
+<contactref element="X10" pad="6"/>
 <wire x1="4.28625" y1="60.79875" x2="4.885103125" y2="60.79875" width="0.18" layer="1"/>
 <wire x1="4.885103125" y1="60.79875" x2="5.58595" y2="61.08905" width="0.18" layer="1" curve="45"/>
 <wire x1="5.58595" y1="61.08905" x2="7.489925" y2="63.068025" width="0.18" layer="1"/>
@@ -4474,7 +4701,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <signal name="USB3.0_TX_P" class="1">
 <contactref element="NGFF1" pad="31"/>
 <contactref element="D8" pad="11"/>
-<contactref element="X8" pad="7"/>
+<contactref element="X10" pad="7"/>
 <wire x1="4.28625" y1="60.14875" x2="4.6358" y2="60.14875" width="0.18" layer="1"/>
 <wire x1="4.6358" y1="60.14875" x2="5.533825" y2="60.520725" width="0.18" layer="1" curve="45"/>
 <wire x1="5.533825" y1="60.520725" x2="7.641125" y2="62.703025" width="0.18" layer="1"/>
@@ -4508,7 +4735,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <signal name="USB3.0_RX_N" class="1">
 <contactref element="NGFF1" pad="35"/>
 <contactref element="D8" pad="9"/>
-<contactref element="X8" pad="9"/>
+<contactref element="X10" pad="9"/>
 <wire x1="36.1115" y1="63.2175" x2="36.1115" y2="61.96553125" width="0.18" layer="1"/>
 <wire x1="36.1115" y1="61.96553125" x2="35.74845" y2="61.08905" width="0.18" layer="1" curve="-45"/>
 <wire x1="35.74845" y1="61.08905" x2="34.268875" y2="59.609475" width="0.18" layer="1"/>
@@ -4549,7 +4776,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <signal name="USB3.0_RX_P" class="1">
 <contactref element="NGFF1" pad="37"/>
 <contactref element="D8" pad="8"/>
-<contactref element="X8" pad="10"/>
+<contactref element="X10" pad="10"/>
 <wire x1="36.6115" y1="63.2175" x2="36.6115" y2="61.96195" width="0.18" layer="1"/>
 <wire x1="36.6115" y1="61.96195" x2="36.239525" y2="61.063925" width="0.18" layer="1" curve="-45"/>
 <wire x1="36.239525" y1="61.063925" x2="34.420075" y2="59.244475" width="0.18" layer="1"/>
@@ -4686,7 +4913,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="46.0375" y="51.1175" extent="1-16" drill="0.3"/>
 <wire x1="43.8615" y1="55.6675" x2="43.8615" y2="53.2935" width="0.3048" layer="1"/>
 <wire x1="43.8615" y1="53.2935" x2="46.0375" y2="51.1175" width="0.3048" layer="1"/>
-<contactref element="R6" pad="2"/>
+<contactref element="R12" pad="2"/>
 <wire x1="56.007" y1="40.3225" x2="57.4675" y2="40.3225" width="0.4064" layer="1"/>
 </signal>
 <signal name="REFCLK_P" class="1">
@@ -4722,26 +4949,27 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="X2" pad="SHELL"/>
 <contactref element="X2" pad="SHELL1"/>
 <contactref element="C5" pad="2"/>
-<contactref element="R9" pad="2"/>
+<contactref element="R8" pad="2"/>
 <wire x1="32.5775" y1="74" x2="32.5775" y2="74.0275" width="0.6" layer="1"/>
-<wire x1="32.5775" y1="74.0275" x2="34.29" y2="75.74" width="0.6" layer="1"/>
-<wire x1="34.29" y1="75.74" x2="43.9775" y2="75.74" width="0.6" layer="1"/>
-<wire x1="43.9775" y1="75.74" x2="45.7175" y2="74" width="0.6" layer="1"/>
-<wire x1="45.7175" y1="74" x2="49.7155" y2="77" width="0.6" layer="1"/>
-<wire x1="49.7155" y1="77" x2="49.7205" y2="76.995" width="0.6" layer="1"/>
-<wire x1="49.7205" y1="76.995" x2="49.69" y2="74.422" width="0.6" layer="1"/>
+<wire x1="32.5775" y1="74.0275" x2="33.9725" y2="74.7875" width="0.6" layer="1"/>
+<wire x1="33.9725" y1="74.7875" x2="43.66" y2="74.7875" width="0.6" layer="1"/>
+<wire x1="43.66" y1="74.7875" x2="45.7175" y2="74" width="0.6" layer="1"/>
+<wire x1="49.7155" y1="75.73" x2="49.7205" y2="75.725" width="0.6" layer="1"/>
+<wire x1="49.7205" y1="75.725" x2="49.69" y2="73.4695" width="0.6" layer="1"/>
+<wire x1="45.7175" y1="74" x2="47.4425" y2="75.725" width="0.6096" layer="1"/>
+<wire x1="47.4425" y1="75.725" x2="49.7205" y2="75.725" width="0.6096" layer="1"/>
 </signal>
 <signal name="_USIM2_CLK">
 <contactref element="NGFF1" pad="44"/>
-<contactref element="X9" pad="9"/>
+<contactref element="X4" pad="9"/>
 <wire x1="38.3615" y1="55.6675" x2="38.3615" y2="50.221" width="0.3048" layer="1"/>
 <wire x1="38.3615" y1="50.221" x2="38.57625" y2="50.00625" width="0.3048" layer="1"/>
 <wire x1="72.39" y1="46.99" x2="71.12" y2="45.72" width="0.6096" layer="1"/>
 <wire x1="71.12" y1="45.72" x2="70.1675" y2="44.7675" width="0.3048" layer="1"/>
 <wire x1="70.1675" y1="44.7675" x2="70.1675" y2="41.91" width="0.3048" layer="1"/>
-<wire x1="70.1675" y1="41.91" x2="69.215" y2="40.9575" width="0.3048" layer="1"/>
-<wire x1="69.215" y1="40.9575" x2="63.1825" y2="40.9575" width="0.3048" layer="1"/>
-<wire x1="63.1825" y1="40.9575" x2="61.9125" y2="42.2275" width="0.3048" layer="1"/>
+<wire x1="70.1675" y1="41.91" x2="69.5325" y2="41.275" width="0.3048" layer="1"/>
+<wire x1="69.5325" y1="41.275" x2="62.865" y2="41.275" width="0.3048" layer="1"/>
+<wire x1="62.865" y1="41.275" x2="61.9125" y2="42.2275" width="0.3048" layer="1"/>
 <wire x1="61.9125" y1="42.2275" x2="50.8" y2="42.2275" width="0.3048" layer="1"/>
 <wire x1="50.8" y1="42.2275" x2="45.72" y2="47.3075" width="0.3048" layer="1"/>
 <via x="45.72" y="47.3075" extent="1-16" drill="0.3"/>
@@ -4757,7 +4985,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="37.62375" y="53.975" extent="1-16" drill="0.3"/>
 <wire x1="37.62375" y1="53.975" x2="37.8615" y2="54.689" width="0.3048" layer="1"/>
 <wire x1="37.8615" y1="54.689" x2="37.8615" y2="55.6675" width="0.3048" layer="1"/>
-<contactref element="X9" pad="5"/>
+<contactref element="X4" pad="5"/>
 <wire x1="52.07" y1="54.9275" x2="57.4675" y2="49.53" width="0.3048" layer="16"/>
 <wire x1="57.4675" y1="49.53" x2="59.69" y2="49.53" width="0.3048" layer="16"/>
 <via x="59.69" y="49.53" extent="1-16" drill="0.3"/>
@@ -4773,8 +5001,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="58.95875" y1="65.50125" x2="57.785" y2="66.675" width="0.4064" layer="1"/>
 <via x="57.785" y="66.675" extent="1-16" drill="0.3"/>
 <wire x1="57.785" y1="66.675" x2="60.6425" y2="66.675" width="0.3048" layer="16"/>
-<contactref element="R14" pad="2"/>
-<contactref element="X9" pad="4"/>
+<contactref element="R21" pad="2"/>
+<contactref element="X4" pad="4"/>
 <wire x1="60.6425" y1="66.675" x2="63.5" y2="63.8175" width="0.3048" layer="16"/>
 <wire x1="63.5" y1="63.8175" x2="63.5" y2="54.9275" width="0.3048" layer="16"/>
 <wire x1="63.5" y1="54.9275" x2="64.77" y2="53.6575" width="0.3048" layer="16"/>
@@ -4786,8 +5014,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="SIM2" pad="1"/>
 <contactref element="C6" pad="2"/>
 <contactref element="R13" pad="1"/>
-<contactref element="X9" pad="2"/>
-<contactref element="D2" pad="5"/>
+<contactref element="X4" pad="2"/>
+<contactref element="D4" pad="5"/>
 <wire x1="54.61" y1="57.8375" x2="54.61" y2="56.96075" width="0.3048" layer="1"/>
 <wire x1="59.38" y1="56.90125" x2="59.313" y2="56.90125" width="0.3048" layer="1"/>
 <wire x1="62.23" y1="49.53" x2="60.96" y2="50.8" width="0.6096" layer="1"/>
@@ -4801,7 +5029,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="_!USIM2_RESET">
 <contactref element="NGFF1" pad="46"/>
-<contactref element="X9" pad="7"/>
+<contactref element="X4" pad="7"/>
 <wire x1="38.8615" y1="55.6675" x2="38.8615" y2="51.9435" width="0.3048" layer="1"/>
 <wire x1="38.8615" y1="51.9435" x2="39.0525" y2="51.435" width="0.3048" layer="1"/>
 <wire x1="69.85" y1="46.99" x2="68.58" y2="45.72" width="0.6096" layer="1"/>
@@ -4820,7 +5048,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="SIM2" pad="3"/>
 <contactref element="C8" pad="1"/>
 <wire x1="59.112" y1="61.98125" x2="59.38" y2="61.98125" width="0.3048" layer="1"/>
-<contactref element="D2" pad="3"/>
+<contactref element="D4" pad="3"/>
 <wire x1="55.08625" y1="63.787" x2="54.5795" y2="63.787" width="0.3048" layer="1"/>
 <wire x1="54.5795" y1="63.787" x2="54.072" y2="63.2795" width="0.3048" layer="1"/>
 <wire x1="54.072" y1="59.5875" x2="54.072" y2="63.2795" width="0.3048" layer="1"/>
@@ -4830,7 +5058,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="58.63575" y1="61.98125" x2="59.38" y2="61.98125" width="0.3048" layer="1"/>
 </signal>
 <signal name="USIM2_DATA">
-<contactref element="R16" pad="2"/>
+<contactref element="R17" pad="2"/>
 <contactref element="SIM2" pad="7"/>
 <contactref element="C9" pad="1"/>
 <wire x1="87.5995" y1="62.07125" x2="85.17" y2="62.07125" width="0.3048" layer="1"/>
@@ -4840,7 +5068,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="87.663" y1="60.325" x2="87.63125" y2="60.35675" width="0.3048" layer="1"/>
 <wire x1="87.63125" y1="60.35675" x2="87.63125" y2="62.0395" width="0.3048" layer="1"/>
 <wire x1="87.63125" y1="62.0395" x2="87.5995" y2="62.07125" width="0.3048" layer="1"/>
-<contactref element="D2" pad="6"/>
+<contactref element="D4" pad="6"/>
 <wire x1="79.21625" y1="58.26125" x2="82.8675" y2="61.9125" width="0.3048" layer="1"/>
 <wire x1="82.8675" y1="61.9125" x2="85.01125" y2="61.9125" width="0.3048" layer="1"/>
 <wire x1="85.01125" y1="61.9125" x2="85.08" y2="61.98125" width="0.3048" layer="1"/>
@@ -4853,11 +5081,11 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="57.49925" y1="57.94375" x2="57.15" y2="57.5945" width="0.3048" layer="1"/>
 </signal>
 <signal name="!USIM2_RESET">
-<contactref element="R20" pad="2"/>
+<contactref element="R18" pad="2"/>
 <contactref element="SIM2" pad="2"/>
 <contactref element="C7" pad="1"/>
 <wire x1="58.7945" y1="59.44125" x2="59.38" y2="59.44125" width="0.3048" layer="1"/>
-<contactref element="D2" pad="1"/>
+<contactref element="D4" pad="1"/>
 <wire x1="55.08625" y1="60.9295" x2="55.148" y2="60.86775" width="0.3048" layer="1"/>
 <wire x1="55.148" y1="60.86775" x2="55.148" y2="59.5875" width="0.3048" layer="1"/>
 <wire x1="56.83125" y1="60.92825" x2="56.83" y2="60.9295" width="0.3048" layer="1"/>
@@ -4875,7 +5103,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="44.1325" y1="42.545" x2="44.1325" y2="15.5575" width="0.3048" layer="16"/>
 <wire x1="44.1325" y1="15.5575" x2="38.735" y2="10.16" width="0.3048" layer="16"/>
 <wire x1="38.735" y1="10.16" x2="38.735" y2="5.461" width="0.3048" layer="16"/>
-<contactref element="JP1" pad="15"/>
+<contactref element="X3" pad="15"/>
 <wire x1="37.465" y1="4.1275" x2="38.735" y2="5.3975" width="0.6096" layer="16"/>
 <wire x1="38.735" y1="5.3975" x2="38.735" y2="5.461" width="0.6096" layer="16"/>
 <via x="44.1325" y="42.545" extent="1-16" drill="0.3"/>
@@ -4891,7 +5119,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="45.085" y1="14.2875" x2="40.005" y2="8.89" width="0.3048" layer="16"/>
 <wire x1="40.005" y1="8.89" x2="40.005" y2="8.5725" width="0.3048" layer="16"/>
 <wire x1="40.005" y1="6.731" x2="40.005" y2="8.5725" width="0.6096" layer="16"/>
-<contactref element="JP1" pad="18"/>
+<contactref element="X3" pad="18"/>
 <via x="45.085" y="43.18" extent="1-16" drill="0.3"/>
 <wire x1="40.005" y1="6.731" x2="40.005" y2="6.6675" width="0.3048" layer="16"/>
 </signal>
@@ -4910,7 +5138,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="40.0685" y1="4.191" x2="41.275" y2="5.3975" width="0.6" layer="16"/>
 <wire x1="41.275" y1="5.3975" x2="41.275" y2="8.5725" width="0.3048" layer="16"/>
 <wire x1="41.275" y1="8.5725" x2="46.0375" y2="13.97" width="0.3048" layer="16"/>
-<contactref element="JP1" pad="17"/>
+<contactref element="X3" pad="17"/>
 <wire x1="40.0685" y1="4.191" x2="40.005" y2="4.1275" width="0.254" layer="16"/>
 <via x="46.0375" y="43.815" extent="1-16" drill="0.3"/>
 </signal>
@@ -4932,7 +5160,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="46.99" y1="44.1325" x2="46.99" y2="42.8625" width="0.3048" layer="15"/>
 <wire x1="46.99" y1="42.8625" x2="46.99" y2="12.065" width="0.3048" layer="16"/>
 <wire x1="46.99" y1="12.065" x2="44.1325" y2="8.255" width="0.3048" layer="16"/>
-<contactref element="JP1" pad="20"/>
+<contactref element="X3" pad="20"/>
 <via x="46.99" y="42.8625" extent="1-16" drill="0.3"/>
 <wire x1="42.545" y1="6.6675" x2="44.1325" y2="8.255" width="0.6096" layer="16"/>
 </signal>
@@ -4941,7 +5169,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="42.3615" y1="55.6675" x2="42.3615" y2="16.009" width="0.3048" layer="1"/>
 <wire x1="42.3615" y1="16.009" x2="34.9885" y2="8.636" width="0.3048" layer="1"/>
 <wire x1="34.9885" y1="8.636" x2="34.925" y2="8.5725" width="0.6096" layer="1"/>
-<contactref element="JP1" pad="14"/>
+<contactref element="X3" pad="14"/>
 <wire x1="34.925" y1="8.5725" x2="34.925" y2="6.6675" width="0.6096" layer="1"/>
 </signal>
 <signal name="PWR_ON">
@@ -4960,7 +5188,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="X1" pad="1"/>
 <wire x1="17.4625" y1="74.93" x2="17.4625" y2="73.3425" width="0.6" layer="1"/>
 <wire x1="17.4625" y1="73.3425" x2="16.51" y2="72.39" width="0.4064" layer="1"/>
-<contactref element="R10" pad="2"/>
+<contactref element="R9" pad="2"/>
 <wire x1="16.51" y1="72.39" x2="15.24" y2="71.12" width="0.3048" layer="1"/>
 <wire x1="15.24" y1="71.12" x2="15.24" y2="70.9295" width="0.3048" layer="1"/>
 </signal>
@@ -4983,7 +5211,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="22.19325" y1="16.16075" x2="22.19325" y2="14.9225" width="0.3048" layer="1"/>
 <wire x1="22.19325" y1="14.9225" x2="22.19325" y2="8.54075" width="0.3048" layer="1"/>
 <wire x1="22.19325" y1="6.71275" x2="22.19325" y2="6.985" width="0.6096" layer="1"/>
-<contactref element="JP1" pad="4"/>
+<contactref element="X3" pad="4"/>
 <wire x1="22.19325" y1="6.985" x2="22.19325" y2="8.54075" width="0.6096" layer="1"/>
 <wire x1="22.225" y1="6.6675" x2="22.19325" y2="6.69925" width="0.254" layer="1"/>
 <wire x1="22.19325" y1="6.69925" x2="22.19325" y2="6.985" width="0.254" layer="1"/>
@@ -4992,7 +5220,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="!GPS_DISABLE">
 <contactref element="NGFF1" pad="26"/>
-<contactref element="R7" pad="1"/>
+<contactref element="R6" pad="1"/>
 <wire x1="33.8615" y1="55.6675" x2="33.8615" y2="57.039" width="0.3048" layer="1"/>
 <wire x1="33.8615" y1="57.039" x2="34.29" y2="57.4675" width="0.3048" layer="1"/>
 <via x="34.29" y="57.4675" extent="1-16" drill="0.3"/>
@@ -5009,7 +5237,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="N$6">
 <contactref element="NGFF1" pad="10"/>
-<contactref element="R3" pad="2"/>
+<contactref element="R2" pad="2"/>
 <wire x1="29.8615" y1="55.6675" x2="29.8615" y2="52.6885" width="0.3048" layer="1"/>
 <wire x1="29.8615" y1="52.6885" x2="30.1625" y2="52.3875" width="0.3048" layer="1"/>
 <via x="30.1625" y="52.3875" extent="1-16" drill="0.3"/>
@@ -5028,20 +5256,19 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="13.0175" y1="69.215" x2="13.97" y2="67.945" width="0.3048" layer="16"/>
 </signal>
 <signal name="N$17">
-<contactref element="X8" pad="4"/>
+<contactref element="X10" pad="4"/>
 </signal>
 <signal name="!PERST">
 <contactref element="NGFF1" pad="50"/>
 <wire x1="39.8615" y1="55.6675" x2="39.8615" y2="54.7535" width="0.3048" layer="1"/>
 <wire x1="39.8615" y1="54.7535" x2="40.3225" y2="54.2925" width="0.3048" layer="1"/>
 <wire x1="40.3225" y1="54.2925" x2="40.3225" y2="43.815" width="0.3048" layer="1"/>
-<wire x1="40.3225" y1="43.815" x2="30.1625" y2="33.655" width="0.3048" layer="1"/>
-<wire x1="30.1625" y1="33.655" x2="30.1625" y2="8.255" width="0.3048" layer="1"/>
-<wire x1="29.9085" y1="8.001" x2="30.1625" y2="8.255" width="0.3048" layer="1"/>
+<wire x1="40.3225" y1="43.815" x2="29.9085" y2="33.401" width="0.3048" layer="1"/>
 <wire x1="29.9085" y1="8.001" x2="29.8585" y2="7.951" width="0.6096" layer="1"/>
-<contactref element="JP1" pad="10"/>
+<contactref element="X3" pad="10"/>
 <wire x1="29.845" y1="6.6675" x2="29.8585" y2="6.681" width="0.6096" layer="1"/>
 <wire x1="29.8585" y1="6.681" x2="29.8585" y2="7.951" width="0.6096" layer="1"/>
+<wire x1="29.9085" y1="8.001" x2="29.9085" y2="33.401" width="0.3048" layer="1"/>
 </signal>
 <signal name="!WAKE_ON_WWAN">
 <contactref element="NGFF1" pad="23"/>
@@ -5053,7 +5280,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="27.305" y1="10.668" x2="26.543" y2="10.668" width="0.3048" layer="1"/>
 <wire x1="26.543" y1="10.668" x2="26.3525" y2="10.4775" width="0.3048" layer="1"/>
 <wire x1="24.8285" y1="7.9375" x2="24.7785" y2="7.8875" width="0.6096" layer="1"/>
-<contactref element="JP1" pad="6"/>
+<contactref element="X3" pad="6"/>
 <wire x1="24.765" y1="6.6675" x2="24.7785" y2="6.681" width="0.6096" layer="1"/>
 <wire x1="24.7785" y1="6.681" x2="24.7785" y2="7.8875" width="0.6096" layer="1"/>
 <wire x1="32.385" y1="48.5775" x2="32.385" y2="48.895" width="0.3048" layer="1"/>
@@ -5073,15 +5300,15 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <signal name="VCC_1V8">
 <contactref element="U1" pad="5"/>
 <contactref element="C12" pad="2"/>
-<contactref element="R12" pad="2"/>
+<contactref element="R10" pad="2"/>
 <wire x1="21.59" y1="71.5645" x2="21.59" y2="72.7075" width="0.3048" layer="1"/>
 <via x="21.59" y="72.7075" extent="1-16" drill="0.3"/>
 <contactref element="R5" pad="2"/>
-<contactref element="R7" pad="2"/>
+<contactref element="R6" pad="2"/>
 <via x="26.67" y="72.7075" extent="1-16" drill="0.3"/>
 <wire x1="26.9875" y1="71.247" x2="26.9875" y2="72.39" width="0.3048" layer="1"/>
 <wire x1="26.9875" y1="72.39" x2="26.67" y2="72.7075" width="0.3048" layer="1"/>
-<contactref element="R8" pad="2"/>
+<contactref element="R7" pad="2"/>
 <via x="28.8925" y="71.755" extent="1-16" drill="0.3"/>
 <wire x1="28.8925" y1="71.755" x2="28.8925" y2="72.7075" width="0.3048" layer="1"/>
 <wire x1="28.8925" y1="72.7075" x2="28.2575" y2="73.2155" width="0.3048" layer="1"/>
@@ -5096,7 +5323,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="10.16" y1="72.0725" x2="12.065" y2="73.9775" width="0.3048" layer="16"/>
 <wire x1="12.065" y1="73.9775" x2="14.76375" y2="73.9775" width="0.3048" layer="16"/>
 <wire x1="14.76375" y1="73.9775" x2="15.5575" y2="73.18375" width="0.3048" layer="16"/>
-<contactref element="R2" pad="2"/>
+<contactref element="R3" pad="2"/>
 <wire x1="14.76375" y1="75.91425" x2="14.76375" y2="73.9775" width="0.4064" layer="1"/>
 <wire x1="14.76375" y1="73.9775" x2="15.5575" y2="73.18375" width="0.4064" layer="1"/>
 <wire x1="15.5575" y1="73.18375" x2="21.11375" y2="73.18375" width="0.4064" layer="15"/>
@@ -5117,7 +5344,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="R4" pad="2"/>
 <wire x1="27.305" y1="12.192" x2="27.305" y2="13.0175" width="0.3048" layer="1"/>
 <via x="27.305" y="13.0175" extent="1-16" drill="0.3"/>
-<contactref element="JP1" pad="19"/>
+<contactref element="X3" pad="19"/>
 <wire x1="41.275" y1="2.794" x2="42.6085" y2="4.1275" width="0.6096" layer="16"/>
 <wire x1="42.6085" y1="4.1275" x2="42.545" y2="4.1275" width="0.6096" layer="16"/>
 <wire x1="27.305" y1="13.0175" x2="34.29" y2="13.0175" width="0.4064" layer="16"/>
@@ -5126,10 +5353,10 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="36.195" y1="2.54" x2="36.5125" y2="2.2225" width="0.4064" layer="16"/>
 <wire x1="36.5125" y1="2.2225" x2="40.7035" y2="2.2225" width="0.4064" layer="16"/>
 <wire x1="40.7035" y1="2.2225" x2="41.275" y2="2.794" width="0.4064" layer="16"/>
-<contactref element="R21" pad="1"/>
+<contactref element="R20" pad="1"/>
 <contactref element="R11" pad="1"/>
 <via x="87.3125" y="51.1175" extent="1-16" drill="0.3"/>
-<wire x1="80.9625" y1="57.4675" x2="80.9625" y2="69.85" width="0.3048" layer="16"/>
+<wire x1="80.9625" y1="62.865" x2="80.9625" y2="69.85" width="0.3048" layer="16"/>
 <via x="80.9625" y="69.85" extent="1-16" drill="0.3"/>
 <wire x1="80.9625" y1="69.85" x2="80.9625" y2="70.993" width="0.3048" layer="1"/>
 <wire x1="80.9625" y1="70.993" x2="80.8355" y2="71.12" width="0.3048" layer="1"/>
@@ -5140,18 +5367,19 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="51.435" y1="76.835" x2="76.835" y2="76.835" width="0.4064" layer="16"/>
 <wire x1="76.835" y1="76.835" x2="80.9625" y2="72.7075" width="0.4064" layer="16"/>
 <wire x1="80.9625" y1="69.85" x2="80.9625" y2="72.7075" width="0.4064" layer="16"/>
-<wire x1="80.9625" y1="57.4675" x2="87.3125" y2="51.1175" width="0.3048" layer="16"/>
+<wire x1="80.9625" y1="62.865" x2="87.3125" y2="56.515" width="0.3048" layer="16"/>
+<wire x1="87.3125" y1="56.515" x2="87.3125" y2="51.1175" width="0.3048" layer="16"/>
 <wire x1="87.3125" y1="49.3395" x2="87.3125" y2="51.1175" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$18">
-<contactref element="R2" pad="1"/>
+<contactref element="R3" pad="1"/>
 <contactref element="X1" pad="2"/>
 <wire x1="17.4625" y1="77.47" x2="14.7955" y2="77.47" width="0.4064" layer="1"/>
 <wire x1="14.7955" y1="77.47" x2="14.76375" y2="77.43825" width="0.4064" layer="1"/>
 </signal>
 <signal name="_USIM1_CLK">
 <contactref element="D1" pad="1"/>
-<contactref element="R15" pad="1"/>
+<contactref element="R14" pad="1"/>
 <contactref element="NGFF1" pad="32"/>
 <wire x1="35.8775" y1="49.2125" x2="35.3615" y2="49.7285" width="0.3048" layer="1"/>
 <wire x1="35.3615" y1="55.6675" x2="35.3615" y2="49.7285" width="0.3048" layer="1"/>
@@ -5168,9 +5396,9 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="48.5775" y1="43.4975" x2="48.5775" y2="41.91" width="0.3048" layer="16"/>
 </signal>
 <signal name="N$3" class="3">
-<contactref element="X3" pad="1-1"/>
-<contactref element="X3" pad="1"/>
-<contactref element="D3" pad="A"/>
+<contactref element="X5" pad="1-1"/>
+<contactref element="X5" pad="1"/>
+<contactref element="D2" pad="A"/>
 <wire x1="9.65" y1="21.2785" x2="3.5" y2="21.2785" width="1.6764" layer="1"/>
 <wire x1="3.5" y1="21.2785" x2="3.4925" y2="22.2385" width="1.6764" layer="1"/>
 <wire x1="3.4925" y1="22.2385" x2="3.4925" y2="26.2175" width="1.9304" layer="1"/>
@@ -5191,14 +5419,14 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="N$11" class="3">
 <contactref element="SIM2" pad="82"/>
-<contactref element="R21" pad="2"/>
+<contactref element="R20" pad="2"/>
 <wire x1="85.08" y1="64.30125" x2="85.08" y2="69.5425" width="0.3048" layer="1"/>
 <wire x1="85.08" y1="69.5425" x2="83.5025" y2="71.12" width="0.3048" layer="1"/>
 <wire x1="82.3595" y1="71.12" x2="83.5025" y2="71.12" width="0.3048" layer="1"/>
 </signal>
 <signal name="_USIM2_POWER">
 <contactref element="NGFF1" pad="48"/>
-<contactref element="X9" pad="1"/>
+<contactref element="X4" pad="1"/>
 <wire x1="39.3615" y1="55.6675" x2="39.3615" y2="53.3315" width="0.3048" layer="1"/>
 <wire x1="39.3615" y1="53.3315" x2="39.52875" y2="53.0225" width="0.3048" layer="1"/>
 <via x="39.52875" y="53.0225" extent="1-16" drill="0.3"/>
@@ -5209,7 +5437,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="_SIM2_DET">
 <contactref element="NGFF1" pad="40"/>
-<contactref element="X9" pad="3"/>
+<contactref element="X4" pad="3"/>
 <wire x1="37.3615" y1="55.6675" x2="37.3615" y2="54.824" width="0.3048" layer="1"/>
 <wire x1="37.3615" y1="54.824" x2="36.98875" y2="54.45125" width="0.3048" layer="1"/>
 <wire x1="36.98875" y1="54.45125" x2="36.98875" y2="53.49875" width="0.3048" layer="1"/>
@@ -5223,8 +5451,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="63.5" y1="48.26" x2="64.77" y2="46.99" width="0.6096" layer="16"/>
 </signal>
 <signal name="N$15">
-<contactref element="R16" pad="1"/>
-<contactref element="X9" pad="6"/>
+<contactref element="R17" pad="1"/>
+<contactref element="X4" pad="6"/>
 <wire x1="67.31" y1="49.53" x2="67.31" y2="51.1175" width="0.6096" layer="1"/>
 <wire x1="67.31" y1="51.1175" x2="69.85" y2="53.6575" width="0.3048" layer="1"/>
 <wire x1="69.85" y1="53.6575" x2="85.4075" y2="53.6575" width="0.3048" layer="1"/>
@@ -5233,8 +5461,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="87.63" y1="59.3395" x2="87.63125" y2="59.34075" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$16">
-<contactref element="X9" pad="8"/>
-<contactref element="R20" pad="1"/>
+<contactref element="X4" pad="8"/>
+<contactref element="R18" pad="1"/>
 <via x="66.04" y="59.3725" extent="1-16" drill="0.3"/>
 <wire x1="66.04" y1="59.3725" x2="66.04" y2="56.515" width="0.3048" layer="16"/>
 <wire x1="66.04" y1="56.515" x2="69.85" y2="52.705" width="0.3048" layer="16"/>
@@ -5247,7 +5475,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="N$19">
 <contactref element="R19" pad="1"/>
-<contactref element="X9" pad="10"/>
+<contactref element="X4" pad="10"/>
 <via x="72.39" y="59.69" extent="1-16" drill="0.3"/>
 <wire x1="72.39" y1="59.69" x2="72.39" y2="51.435" width="0.3048" layer="16"/>
 <wire x1="72.39" y1="51.435" x2="72.39" y2="49.53" width="0.6096" layer="16"/>
@@ -5709,13 +5937,19 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,1eec8d5c028dc7c8"/>
 <approved hash="5,16,0e3dc4636072a4f2"/>
 <approved hash="5,1,dcbe32666d30c021"/>
-<approved hash="5,1,7c6ffa1781b4c1ea"/>
 <approved hash="5,1,be31869a6d6e56d4"/>
-<approved hash="5,1,ac04cb1e3b1621f3"/>
 <approved hash="5,1,fb1876b776a9b4c2"/>
-<approved hash="5,1,815d1d7453e880c3"/>
-<approved hash="3,1,cc679419962ace54"/>
+<approved hash="3,1,25358f7f87943615"/>
+<approved hash="5,1,ff312c6721818f28"/>
+<approved hash="5,1,ccb81a0f17478ef2"/>
+<approved hash="5,1,f315030e9728a115"/>
+<approved hash="5,1,53ca9584c25a3c67"/>
+<approved hash="5,1,d33905667a562011"/>
+<approved hash="5,1,6ba3ae25d4322f99"/>
+<approved hash="5,1,15738d1d1fc9bc02"/>
 <approved hash="3,16,1dc11e2b1cd31f39"/>
+<approved hash="3,1,cc679419962ace54"/>
+<approved hash="3,16,a87a59905a1cabf6"/>
 <approved hash="3,2,1a02c9e8c99e1a74"/>
 <approved hash="3,1,b5421e641994b2b2"/>
 <approved hash="3,1,e493dda39ff29338"/>
@@ -5984,12 +6218,13 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="3,1,0f77d24aeccdb2d8"/>
 <approved hash="3,1,c019c77c4544546d"/>
 <approved hash="3,1,564001a601f45612"/>
-<approved hash="3,1,25358f7f87943615"/>
+<approved hash="3,1,68ad40410145c293"/>
+<approved hash="3,1,fe8703a10392feb4"/>
 <approved hash="3,1,30e22e04290237e4"/>
 <approved hash="3,1,a1e8b6014109f171"/>
 <approved hash="3,1,662fc509c2fa61dc"/>
-<approved hash="4,1,42cf1d454d5ed207"/>
 <approved hash="4,1,087557330ff4986d"/>
+<approved hash="4,1,42cf1d454d5ed207"/>
 <approved hash="5,1,b916beb496973522"/>
 <approved hash="5,1,b4e1c53da358a8df"/>
 <approved hash="5,1,0a0cdad2e34cabee"/>
@@ -6001,18 +6236,18 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,0fe5d9a4db3c8e79"/>
 <approved hash="5,1,dc26cd1b116bf71c"/>
 <approved hash="5,1,b7f573996239a20d"/>
-<approved hash="5,1,9128dcd535640fe9"/>
-<approved hash="5,1,3018c212d0946347"/>
 <approved hash="5,1,d31f11e6c4744d8c"/>
 <approved hash="5,1,87ea1eb676af37dc"/>
+<approved hash="5,1,9128dcd535640fe9"/>
+<approved hash="5,1,3018c212d0946347"/>
 <approved hash="5,1,d7da7138dbe5b38b"/>
 <approved hash="5,1,313008e66af85c47"/>
 <approved hash="5,1,f7a55ae07b88609e"/>
 <approved hash="5,1,092495c3f0059a1d"/>
-<approved hash="5,1,c40f668739065ee8"/>
 <approved hash="5,1,93f84e89bd9b088e"/>
-<approved hash="5,1,5aadf1fe8284b4bf"/>
+<approved hash="5,1,c40f668739065ee8"/>
 <approved hash="5,1,af3b64cf3cf89a5a"/>
+<approved hash="5,1,5aadf1fe8284b4bf"/>
 <approved hash="5,1,9bca6f75c7fd120b"/>
 <approved hash="5,1,272f28ee6cd1a94d"/>
 <approved hash="5,1,cc142ee7f867c994"/>
@@ -6028,12 +6263,12 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="19,1,8ba3e42550ad875b"/>
 <approved hash="5,1,69433dbc65ba34fb"/>
 <approved hash="5,1,c0a369a271a5b4cf"/>
-<approved hash="5,1,24448f22643c9d39"/>
 <approved hash="19,1,cc9efb58f642ffeb"/>
+<approved hash="5,1,24448f22643c9d39"/>
 <approved hash="5,1,d8067cd336e34559"/>
 <approved hash="5,1,e78e3e954e64983f"/>
-<approved hash="19,1,d282dd16c078d5ee"/>
 <approved hash="5,1,30644e3918b436e5"/>
+<approved hash="19,1,d282dd16c078d5ee"/>
 <approved hash="5,1,e794e93ef5f07c1d"/>
 <approved hash="5,1,c546e5ca6cd1dca8"/>
 <approved hash="5,1,3926129a9115e210"/>
@@ -6044,32 +6279,32 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,f81136cefb70ff61"/>
 <approved hash="19,1,d813f647531efe2f"/>
 <approved hash="5,1,3102c5efe50e36ef"/>
-<approved hash="5,1,8b2c477fa045f026"/>
 <approved hash="5,1,daed9fd64d90df93"/>
+<approved hash="5,1,8b2c477fa045f026"/>
 <approved hash="5,1,368dd5cc94ba31f7"/>
 <approved hash="19,1,08cb85a8e982fb80"/>
 <approved hash="5,1,f5887d7ab6de0557"/>
-<approved hash="5,1,02fee4b890f235d5"/>
 <approved hash="5,1,a501d7d7be71f390"/>
+<approved hash="5,1,02fee4b890f235d5"/>
 <approved hash="5,1,342926b276f6744e"/>
 <approved hash="19,1,08bc6dc457dab452"/>
-<approved hash="5,1,5b1fad8762c20e37"/>
 <approved hash="5,1,44ffafce7f6d0e31"/>
-<approved hash="5,1,5be7b77b783e0ecf"/>
-<approved hash="5,1,5ae3b4ec7b8f0fed"/>
+<approved hash="5,1,5b1fad8762c20e37"/>
 <approved hash="5,1,5be3b25d7d1c0ecf"/>
+<approved hash="5,1,5be7b77b783e0ecf"/>
 <approved hash="19,1,383a23bc168685d0"/>
-<approved hash="5,1,8b2d6ae224c47464"/>
-<approved hash="5,1,c300250a6312d33e"/>
+<approved hash="5,1,5ae3b4ec7b8f0fed"/>
 <approved hash="5,1,e5cdc278bfe4da31"/>
 <approved hash="5,1,e78e3e9de8d2e087"/>
-<approved hash="5,1,477afb40b2746782"/>
-<approved hash="5,1,9c2869b39a8b3645"/>
-<approved hash="5,1,4715b6c27897a409"/>
+<approved hash="5,1,c300250a6312d33e"/>
+<approved hash="5,1,8b2d6ae224c47464"/>
 <approved hash="5,1,f76b03d8902fe74c"/>
+<approved hash="5,1,4715b6c27897a409"/>
 <approved hash="5,1,521b1a8c63179438"/>
 <approved hash="5,1,529be2fe77058018"/>
 <approved hash="5,1,f786fe87fa795ed2"/>
+<approved hash="5,1,9c2869b39a8b3645"/>
+<approved hash="5,1,477afb40b2746782"/>
 <approved hash="5,1,ad3fc6798301d3e0"/>
 <approved hash="5,1,303e82152eb61941"/>
 <approved hash="5,1,5d3d36e2b74b5a4f"/>
@@ -6091,11 +6326,11 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,e4493b5d80d76f01"/>
 <approved hash="5,1,452e84df16fe4ffc"/>
 <approved hash="5,1,318d39a9324761c3"/>
-<approved hash="5,1,ff312c6721818f28"/>
-<approved hash="5,1,a42b9ea05b37688c"/>
-<approved hash="5,1,a5fad71e422887fa"/>
+<approved hash="5,1,ac04cb1e3b1621f3"/>
 <approved hash="5,1,7ff2f004b2acc920"/>
 <approved hash="5,1,3385e76c39705590"/>
+<approved hash="5,1,a42b9ea05b37688c"/>
+<approved hash="5,1,a5fad71e422887fa"/>
 <approved hash="5,1,a436a3b1baa3f466"/>
 <approved hash="5,1,fa780c3bdbf0d86c"/>
 <approved hash="5,1,efa7c70fa82e9ac5"/>
@@ -6108,8 +6343,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,991755962e290336"/>
 <approved hash="5,1,886531409eafbbcb"/>
 <approved hash="5,1,d6ee5c6e2a29a99e"/>
-<approved hash="5,1,f7be5590118e5dd2"/>
 <approved hash="5,1,8d8c952c1208200c"/>
+<approved hash="5,1,f7be5590118e5dd2"/>
 <approved hash="5,1,2422e053010b25ab"/>
 <approved hash="5,1,5c1f588fd9af5fbd"/>
 <approved hash="5,1,76ccfd6d0d86b227"/>
@@ -6117,15 +6352,15 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,a2fc68cfebc56e32"/>
 <approved hash="5,1,9e5ffd8c4335b05c"/>
 <approved hash="5,1,8aa606aa5ff4b066"/>
-<approved hash="5,1,c982992ccd65e475"/>
 <approved hash="5,1,4e892c3695ecb098"/>
+<approved hash="5,1,c982992ccd65e475"/>
 <approved hash="5,1,33d903b70e45aa57"/>
 <approved hash="5,1,dc567ba3dbfec09b"/>
 <approved hash="5,1,7f8fe7ac0dcf2308"/>
-<approved hash="5,1,fa78103bcbb0d8ac"/>
 <approved hash="5,1,c21d4cc4ea66119d"/>
-<approved hash="5,1,d9cbb41633ef36ee"/>
+<approved hash="5,1,fa78103bcbb0d8ac"/>
 <approved hash="5,1,168c27ef88aebf0e"/>
+<approved hash="5,1,d9cbb41633ef36ee"/>
 <approved hash="5,1,1f5e46bfcfb916c4"/>
 <approved hash="5,1,541855d2e4e67eb4"/>
 <approved hash="5,1,c9ffb9c9d8634a37"/>
@@ -6134,24 +6369,24 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,8d06854edea9a996"/>
 <approved hash="5,1,d3e4a08ca6486144"/>
 <approved hash="5,1,15b9afd7c7890d92"/>
-<approved hash="5,1,ccb81a0f17478ef2"/>
-<approved hash="5,1,abbb25fcf46dd9bc"/>
-<approved hash="5,1,9e5c0b8fab75a7dc"/>
+<approved hash="5,1,815d1d7453e880c3"/>
 <approved hash="5,1,db8e4b49a9b7566e"/>
 <approved hash="5,1,762fa5cfd3b3a05a"/>
+<approved hash="5,1,9e5c0b8fab75a7dc"/>
+<approved hash="5,1,abbb25fcf46dd9bc"/>
 <approved hash="5,1,bf7719d2c9e4fbc0"/>
-<approved hash="5,1,3c7f23023d4559b3"/>
 <approved hash="5,1,21e92661b623f8e9"/>
-<approved hash="5,1,023f776648cbb403"/>
+<approved hash="5,1,3c7f23023d4559b3"/>
 <approved hash="5,1,1e7f83ffdd12c5eb"/>
+<approved hash="5,1,023f776648cbb403"/>
 <approved hash="5,1,76d178e8cf523d4e"/>
 <approved hash="5,1,6676b3b450feb4b9"/>
-<approved hash="5,1,8c0263839e81bce3"/>
 <approved hash="5,1,83683870fc6f8c5f"/>
+<approved hash="5,1,8c0263839e81bce3"/>
 <approved hash="5,1,7cca55ac6d89c2ec"/>
 <approved hash="5,1,ba0137278013d9aa"/>
-<approved hash="5,1,79ec92fc7af149b1"/>
 <approved hash="5,1,cb7860e0cf9e1017"/>
+<approved hash="5,1,79ec92fc7af149b1"/>
 <approved hash="5,1,ec0a4f9056e6defb"/>
 <approved hash="5,1,1d57a9887f5834b5"/>
 <approved hash="5,1,48dbe554f51fa07d"/>
@@ -6168,17 +6403,17 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,ca5b8c3e58d92e19"/>
 <approved hash="5,1,bd1c60615b18c608"/>
 <approved hash="5,1,3a09663cd153bbb0"/>
-<approved hash="5,1,275765e98f86d823"/>
 <approved hash="5,1,43cb4212c22064d1"/>
-<approved hash="5,1,f315030e9728a115"/>
-<approved hash="5,1,70e4029e7bbe5773"/>
+<approved hash="5,1,275765e98f86d823"/>
+<approved hash="5,1,7c6ffa1781b4c1ea"/>
 <approved hash="5,1,dcb8799302dfceac"/>
+<approved hash="5,1,70e4029e7bbe5773"/>
 <approved hash="5,1,23ca72feb48a8390"/>
 <approved hash="5,1,3afe6a336d1f6417"/>
-<approved hash="5,1,8463d8ea5d30db77"/>
 <approved hash="5,1,25b290ce10ec799d"/>
-<approved hash="5,1,5d3194b709225190"/>
+<approved hash="5,1,8463d8ea5d30db77"/>
 <approved hash="5,1,fd48ba00d87a4768"/>
+<approved hash="5,1,5d3194b709225190"/>
 <approved hash="5,1,bcfc2ae00abff1dc"/>
 <approved hash="5,1,2971ca73678776b2"/>
 <approved hash="5,1,331dee425acae77f"/>
@@ -6209,8 +6444,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,f53d86c87d4852a0"/>
 <approved hash="5,1,e41a2a78609fc05e"/>
 <approved hash="5,1,864593e7ba258ed9"/>
-<approved hash="5,1,f5a3db9a6efd653c"/>
 <approved hash="5,1,2606a47ef1f9cef5"/>
+<approved hash="5,1,f5a3db9a6efd653c"/>
 <approved hash="5,1,0b3da0c85d5623a0"/>
 <approved hash="5,1,001a28788881b75e"/>
 <approved hash="5,1,a245b7f9a53b91d9"/>
@@ -6231,8 +6466,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,853d96c86d67daa0"/>
 <approved hash="5,1,e41a2a7870b0485e"/>
 <approved hash="5,1,864593c8320a06d9"/>
-<approved hash="5,1,c0f67c2519e01c64"/>
 <approved hash="5,1,02b86ae4e9fe2d44"/>
+<approved hash="5,1,c0f67c2519e01c64"/>
 <approved hash="5,1,e3799fee56603905"/>
 <approved hash="5,1,b5a60e821295077b"/>
 <approved hash="5,1,feb5397a4860abe3"/>
@@ -6287,25 +6522,25 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,91687c1c2eb167e4"/>
 <approved hash="5,1,841a2a7800a4d05e"/>
 <approved hash="5,1,a645b3dcca1efed9"/>
-<approved hash="5,1,161e1c1d5a3c2ee7"/>
 <approved hash="5,1,f8ce988240591a7a"/>
 <approved hash="5,1,f2d7b38181d34b88"/>
 <approved hash="5,1,44c1e25f75b93acd"/>
-<approved hash="5,1,8807ee2e36b3248c"/>
-<approved hash="5,1,6432541504bc4a77"/>
-<approved hash="5,1,f424dfa1c4b89bb7"/>
+<approved hash="5,1,161e1c1d5a3c2ee7"/>
 <approved hash="5,1,5a9db2842c637bf2"/>
-<approved hash="5,1,bc77f42d73a711ad"/>
+<approved hash="5,1,f424dfa1c4b89bb7"/>
+<approved hash="5,1,6432541504bc4a77"/>
+<approved hash="5,1,8807ee2e36b3248c"/>
 <approved hash="5,1,bd32570ae3a1fcbd"/>
+<approved hash="5,1,bc77f42d73a711ad"/>
 <approved hash="5,1,04c188c04db96997"/>
 <approved hash="5,1,8de9a17c1f9a7746"/>
 <approved hash="5,1,8b3d80c87d71d3a0"/>
 <approved hash="5,1,e01a287868a6475e"/>
 <approved hash="5,1,824597de351c01d9"/>
-<approved hash="5,1,8ad391f9e27c3501"/>
-<approved hash="5,1,6e5c7a7196eb4bdf"/>
 <approved hash="5,1,f252c9a9e57bb8eb"/>
 <approved hash="5,1,fe8efc4e6e871691"/>
+<approved hash="5,1,8ad391f9e27c3501"/>
+<approved hash="5,1,6e5c7a7196eb4bdf"/>
 <approved hash="5,1,84b078229e5a1b83"/>
 <approved hash="5,1,7692de5c7a7691a0"/>
 <approved hash="5,1,8aa768b28c049250"/>
@@ -6314,8 +6549,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,053d9ec85d7faca3"/>
 <approved hash="5,1,001a2a7b88a8365d"/>
 <approved hash="5,1,a245b7d028121cd9"/>
-<approved hash="5,1,78a00889223af025"/>
 <approved hash="5,1,ba2d15d30cd806b2"/>
+<approved hash="5,1,78a00889223af025"/>
 <approved hash="5,1,073d5cc8ad7a3da0"/>
 <approved hash="5,1,f5de737d32f0c823"/>
 <approved hash="5,1,2c1ad478a8ada55e"/>
@@ -6323,8 +6558,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,9b041c49273cbbfe"/>
 <approved hash="5,1,73970ae85b7dbbf7"/>
 <approved hash="5,1,21d49f0034a8da59"/>
-<approved hash="5,1,cbd06588b95a8ef7"/>
 <approved hash="5,1,05e3b3f05d538edd"/>
+<approved hash="5,1,cbd06588b95a8ef7"/>
 <approved hash="5,1,053c5ec9ad788ea1"/>
 <approved hash="5,1,64fef27cf011666b"/>
 <approved hash="5,1,0c1a2a7988af145f"/>
@@ -6332,29 +6567,25 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,26249612d58346c2"/>
 <approved hash="5,1,4b13800a662291db"/>
 <approved hash="5,1,b2300b1c9b1dd631"/>
-<approved hash="5,1,53ca9584c25a3c67"/>
-<approved hash="5,1,6653ea1468b55b19"/>
 <approved hash="5,1,cb9965e1a2441a96"/>
+<approved hash="5,1,6653ea1468b55b19"/>
 <approved hash="5,1,033d90c86d071fa0"/>
 <approved hash="5,1,e01a287870d08b5e"/>
 <approved hash="5,1,824597a8716a45d9"/>
-<approved hash="5,1,d33905667a562011"/>
-<approved hash="5,1,b40e7d191b19ea7e"/>
-<approved hash="5,1,fbc7aa02ce875c12"/>
-<approved hash="5,1,e631b65505508fc4"/>
-<approved hash="5,1,4e6f38670b91a9a2"/>
 <approved hash="5,1,770b9421ad453292"/>
+<approved hash="5,1,4e6f38670b91a9a2"/>
 <approved hash="5,1,853d96c86d05e8a0"/>
-<approved hash="5,1,dfc0dcc9fa699ab0"/>
+<approved hash="5,1,fbc7aa02ce875c12"/>
+<approved hash="5,1,b40e7d191b19ea7e"/>
+<approved hash="5,1,e631b65505508fc4"/>
 <approved hash="5,1,801a2a7870d27a5e"/>
+<approved hash="5,1,dfc0dcc9fa699ab0"/>
 <approved hash="5,1,a245b7aa646850d9"/>
-<approved hash="5,1,6ba3ae25d4322f99"/>
-<approved hash="5,1,15738d1d1fc9bc02"/>
 <approved hash="5,1,f98b9915e824c7b9"/>
 <approved hash="5,1,dbce97dbc543129d"/>
-<approved hash="5,1,7c02a23a64492ad3"/>
 <approved hash="5,1,2e5f375f539cd6bc"/>
 <approved hash="5,1,873dd4c82d0079a0"/>
+<approved hash="5,1,7c02a23a64492ad3"/>
 <approved hash="5,1,b90b2aba2ae6d21e"/>
 <approved hash="5,1,c645d3afd76de3d9"/>
 <approved hash="5,1,de9da351566cf380"/>
@@ -6363,8 +6594,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,a645b3a1426376d9"/>
 <approved hash="5,1,0b1f65f78eff5bd9"/>
 <approved hash="5,1,ba0cc795c002f19b"/>
-<approved hash="5,1,3c99e81d39a22691"/>
 <approved hash="5,1,bc658aad2bcd1f45"/>
+<approved hash="5,1,3c99e81d39a22691"/>
 <approved hash="5,1,515d152c6f97d175"/>
 <approved hash="5,1,e8ac8094bedfdc95"/>
 <approved hash="5,1,8b3d90c86d0d5ba0"/>
@@ -6403,83 +6634,84 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <approved hash="5,1,9d38c7f008fa5721"/>
 <approved hash="5,1,aeb5397a2011ffe3"/>
 <approved hash="5,1,b83886d8eca6e51c"/>
-<approved hash="5,1,6015e5281e812495"/>
 <approved hash="5,1,5aeae4d2cc908a6d"/>
+<approved hash="5,1,6015e5281e812495"/>
 <approved hash="5,1,133da0c85d1287a1"/>
 <approved hash="5,1,001a287980c5135f"/>
 <approved hash="5,1,a245b7bd097f3dd9"/>
-<approved hash="5,1,e4fadd563d91fb61"/>
 <approved hash="5,1,86c95692d589aa39"/>
+<approved hash="5,1,e4fadd563d91fb61"/>
 <approved hash="5,1,f37989ee2014f405"/>
 <approved hash="5,1,e8b53b7a4c1460e3"/>
 <approved hash="5,1,9438aadd19a3101c"/>
 <approved hash="5,1,f53d86c87d1110a0"/>
 <approved hash="5,1,824597be7c7c48d9"/>
 <approved hash="5,1,2da4a0b33d26e8d9"/>
-<approved hash="5,1,b7cde070b0f726e8"/>
 <approved hash="5,1,f3798feea61a8305"/>
+<approved hash="5,1,b7cde070b0f726e8"/>
 <approved hash="5,1,b4388ad30ead071c"/>
 <approved hash="5,1,bc48133fa2dc29f4"/>
-<approved hash="5,1,494c66fa58cf999b"/>
 <approved hash="5,1,c1ed5f5a33a8f8f8"/>
 <approved hash="5,1,c7bf1bc1efea60ca"/>
+<approved hash="5,1,494c66fa58cf999b"/>
 <approved hash="5,1,5df7d7be83c63dd4"/>
-<approved hash="5,1,3d95081e93c37712"/>
 <approved hash="5,1,b501727f227789ef"/>
+<approved hash="5,1,3d95081e93c37712"/>
 <approved hash="5,1,e3cd69be87c639ee"/>
 <approved hash="5,1,34fa8aa7be7a2512"/>
 <approved hash="5,1,c5010780d74e4287"/>
 <approved hash="5,1,4815b5ea2770b606"/>
 <approved hash="5,1,66efbb031b4b0462"/>
 <approved hash="5,1,cf0988c7af31204a"/>
-<approved hash="5,1,d1aee2ef4f0a3a21"/>
 <approved hash="5,1,d3deef7e77511668"/>
-<approved hash="5,1,ad10bb2ae332796e"/>
-<approved hash="5,1,e732bd9b71c3d402"/>
-<approved hash="5,1,aea194cc8a2ad758"/>
+<approved hash="5,1,d1aee2ef4f0a3a21"/>
 <approved hash="5,1,2b0ea11deef6deac"/>
 <approved hash="5,1,354d0b5a3f17a512"/>
+<approved hash="5,1,e732bd9b71c3d402"/>
+<approved hash="5,1,ad10bb2ae332796e"/>
+<approved hash="5,1,aea194cc8a2ad758"/>
 <approved hash="5,1,7db59ece2294e861"/>
 <approved hash="5,1,56fce1d86cdfde3e"/>
 <approved hash="5,1,1df988e0cbd89232"/>
 <approved hash="5,1,81e856ac339bbacc"/>
-<approved hash="5,1,f1fd3b38f8b0f240"/>
-<approved hash="5,1,2b7b3890cb232ef4"/>
-<approved hash="5,1,bdb3e21f79b4cbee"/>
 <approved hash="5,1,1b74315fbb66c6c8"/>
 <approved hash="5,1,2a093c2197493ead"/>
-<approved hash="5,1,135d2fd63b60708b"/>
-<approved hash="5,1,9a6c48c60c7f7a83"/>
-<approved hash="5,1,0dd79200a7c74069"/>
+<approved hash="5,1,f1fd3b38f8b0f240"/>
+<approved hash="5,1,bdb3e21f79b4cbee"/>
+<approved hash="5,1,2b7b3890cb232ef4"/>
 <approved hash="5,1,1dae23683ecf7714"/>
-<approved hash="5,1,e23a287f4cdbbfd6"/>
 <approved hash="5,1,689d22608d63a673"/>
-<approved hash="5,1,9b2ad38c8ad2ba66"/>
-<approved hash="5,1,862aed0dd384dbbe"/>
-<approved hash="5,1,ce0a1fe57f3663b6"/>
+<approved hash="5,1,e23a287f4cdbbfd6"/>
+<approved hash="5,1,135d2fd63b60708b"/>
+<approved hash="5,1,0dd79200a7c74069"/>
+<approved hash="5,1,9a6c48c60c7f7a83"/>
 <approved hash="5,1,c4fd0001626782e9"/>
 <approved hash="5,1,4f680180d279f0e6"/>
-<approved hash="5,1,b99057621b103258"/>
+<approved hash="5,1,862aed0dd384dbbe"/>
+<approved hash="5,1,9b2ad38c8ad2ba66"/>
+<approved hash="5,1,ce0a1fe57f3663b6"/>
 <approved hash="5,1,57fa78e033febb69"/>
+<approved hash="5,1,b99057621b103258"/>
 <approved hash="5,1,be8dffb19309021b"/>
-<approved hash="5,1,1cbb885f7a785012"/>
-<approved hash="5,1,464fd1ec32838ae2"/>
-<approved hash="5,1,b53aa4bb20e14587"/>
-<approved hash="5,1,f51b9e2db0659eee"/>
 <approved hash="5,1,200b72da76398d07"/>
 <approved hash="5,1,9afb99b1fbfa7f3d"/>
+<approved hash="5,1,b53aa4bb20e14587"/>
+<approved hash="5,1,f51b9e2db0659eee"/>
+<approved hash="5,1,1cbb885f7a785012"/>
+<approved hash="5,1,464fd1ec32838ae2"/>
 <approved hash="5,1,1d4b8172ccea02a8"/>
 <approved hash="5,1,5dc7fb03954a8c42"/>
 <approved hash="5,1,71352eda263bb0bb"/>
 <approved hash="5,1,bcf7f2362eb8064e"/>
 <approved hash="4,2,087557330ff4986d"/>
 <approved hash="4,2,42cf1d454d5ed207"/>
-<approved hash="4,15,42cf1d454d5ed207"/>
 <approved hash="4,15,087557330ff4986d"/>
+<approved hash="4,15,42cf1d454d5ed207"/>
 <approved hash="5,15,bcceef01b6c19bd9"/>
 <approved hash="5,15,bce82d13fb01d7b6"/>
-<approved hash="4,16,42cf1d454d5ed207"/>
 <approved hash="4,16,087557330ff4986d"/>
+<approved hash="4,16,42cf1d454d5ed207"/>
+<approved hash="5,16,305a24cdedd6f640"/>
 <approved hash="5,16,08232849ad5577c4"/>
 <approved hash="5,16,6dd5382eac49256b"/>
 <approved hash="5,16,0cc10ce38dc6f07f"/>
diff --git a/ngff-breakout/ngff-breakout.sch b/ngff-breakout/ngff-breakout.sch
index e41c7bc..06970a7 100644
--- a/ngff-breakout/ngff-breakout.sch
+++ b/ngff-breakout/ngff-breakout.sch
@@ -13199,7 +13199,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="UNKNOWN SOURCE"/>
 <attribute name="SOURCEPARTNUMBER" value="UNKNOWN SOURCE PART NUMBER"/>
 </part>
-<part name="R18" library="rc-sysmocom" deviceset="RESISTOR" device="_0402" value="47">
+<part name="R16" library="rc-sysmocom" deviceset="RESISTOR" device="_0402" value="47">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES SMD 47 OHM 5%% 1/10W 0603"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-0747RL/311-47GRCT-ND/729740"/>
@@ -13210,7 +13210,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="311-47GRCT-ND"/>
 </part>
-<part name="R15" library="rc-sysmocom" deviceset="RESISTOR" device="_0402" value="47">
+<part name="R14" library="rc-sysmocom" deviceset="RESISTOR" device="_0402" value="47">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES SMD 47 OHM 5%% 1/10W 0603"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-0747RL/311-47GRCT-ND/729740"/>
@@ -13221,7 +13221,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="311-47GRCT-ND"/>
 </part>
-<part name="R17" library="rc-sysmocom" deviceset="RESISTOR" device="_0402" value="47">
+<part name="R15" library="rc-sysmocom" deviceset="RESISTOR" device="_0402" value="47">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="CRGCQ 0402 47R 1%%"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/te-connectivity-passive-product/CRGCQ0402F47R/A129611CT-ND/"/>
@@ -13266,7 +13266,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCEPARTNUMBER" value="1276-6455-1-ND"/>
 </part>
 <part name="GND4" library="supply1" deviceset="GND" device=""/>
-<part name="X3" library="Wurth_Elektronik_Electromechanic_DC_Power_Jack_Connectors_rev15c" deviceset="694108106102" device="">
+<part name="X5" library="Wurth_Elektronik_Electromechanic_DC_Power_Jack_Connectors_rev15c" deviceset="694108106102" device="">
 <attribute name="CLASS" value="RELAY"/>
 <attribute name="DESCRIPTION" value="CONN PWR JACK 2.5X5.5MM SOLDER"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/wurth-electronics-inc/694108106102/732-5933-1-ND/5047628"/>
@@ -13277,7 +13277,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="732-5933-1-ND"/>
 </part>
-<part name="X4" library="jumper" deviceset="JP2E" device="">
+<part name="X6" library="jumper" deviceset="JP2E" device="">
 <attribute name="CLASS" value="CONNECTOR\JUMPER"/>
 <attribute name="DESCRIPTION" value="NO DESCRIPTION"/>
 <attribute name="LINK" value="UNKNOWN LINK"/>
@@ -13506,7 +13506,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="490-7217-1-ND"/>
 </part>
-<part name="R3" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="330">
+<part name="R2" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="330">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES SMD 330 OHM 5%% 1/10W 0603"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-07330RL/311-330GRCT-ND/729716"/>
@@ -13517,7 +13517,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="311-330GRCT-ND"/>
 </part>
-<part name="X5" library="laforge" deviceset="SMA-F" device="-S-TH">
+<part name="X7" library="laforge" deviceset="SMA-F" device="-S-TH">
 <attribute name="CLASS" value="CONNECTOR"/>
 <attribute name="DESCRIPTION" value="CONN SMA JACK STR 50 OHM PCB"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/te-connectivity-amp-connectors/5-1814832-1/A97594-ND/1755982"/>
@@ -13528,7 +13528,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="A97594-ND"/>
 </part>
-<part name="X6" library="laforge" deviceset="SMA-F" device="-S-TH">
+<part name="X8" library="laforge" deviceset="SMA-F" device="-S-TH">
 <attribute name="CLASS" value="CONNECTOR"/>
 <attribute name="DESCRIPTION" value="CONN SMA JACK STR 50 OHM PCB"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/te-connectivity-amp-connectors/5-1814832-1/A97594-ND/1755982"/>
@@ -13541,7 +13541,7 @@ Various fiducial points for machine vision alignment.</description>
 </part>
 <part name="GND14" library="supply1" deviceset="GND" device=""/>
 <part name="GND15" library="supply1" deviceset="GND" device=""/>
-<part name="X7" library="laforge" deviceset="SMA-F" device="-S-TH">
+<part name="X9" library="laforge" deviceset="SMA-F" device="-S-TH">
 <attribute name="CLASS" value="CONNECTOR"/>
 <attribute name="DESCRIPTION" value="CONN SMA JACK STR 50 OHM PCB"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/te-connectivity-amp-connectors/5-1814832-1/A97594-ND/1755982"/>
@@ -13641,7 +13641,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCEPARTNUMBER" value="1276-1005-1-ND"/>
 </part>
 <part name="GND22" library="supply1" deviceset="GND" device=""/>
-<part name="R9" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="330">
+<part name="R8" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="330">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES SMD 330 OHM 5%% 1/10W 0603"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-07330RL/311-330GRCT-ND/729716"/>
@@ -13663,7 +13663,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="311-330GRCT-ND"/>
 </part>
-<part name="R20" library="rc-sysmocom" deviceset="RESISTOR" device="_0402" value="47">
+<part name="R18" library="rc-sysmocom" deviceset="RESISTOR" device="_0402" value="47">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES SMD 47 OHM 5%% 1/10W 0603"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-0747RL/311-47GRCT-ND/729740"/>
@@ -13685,7 +13685,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="311-47GRCT-ND"/>
 </part>
-<part name="R16" library="rc-sysmocom" deviceset="RESISTOR" device="_0402" value="47">
+<part name="R17" library="rc-sysmocom" deviceset="RESISTOR" device="_0402" value="47">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES SMD 47 OHM 5%% 1/10W 0603"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/yageo/RC0603JR-0747RL/311-47GRCT-ND/729740"/>
@@ -13767,7 +13767,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="RMCF0603FT10K0CT-ND"/>
 </part>
-<part name="R8" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="10k">
+<part name="R7" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="10k">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/10W 0603"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RMCF0603FT10K0/RMCF0603FT10K0CT-ND"/>
@@ -13778,7 +13778,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="RMCF0603FT10K0CT-ND"/>
 </part>
-<part name="R7" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="10k">
+<part name="R6" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="10k">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/10W 0603"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RMCF0603FT10K0/RMCF0603FT10K0CT-ND"/>
@@ -13789,7 +13789,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="RMCF0603FT10K0CT-ND"/>
 </part>
-<part name="R12" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="10k">
+<part name="R10" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="10k">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/10W 0603"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RMCF0603FT10K0/RMCF0603FT10K0CT-ND"/>
@@ -13822,7 +13822,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="RMCF0603FT10K0CT-ND"/>
 </part>
-<part name="D2" library="laforge" deviceset="PESD5V0UBV" device="">
+<part name="D4" library="laforge" deviceset="PESD5V0UBV" device="">
 <attribute name="CLASS" value="DIODE"/>
 <attribute name="DESCRIPTION" value="TVS DIODE 5V SOT666"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/nexperia-usa-inc/PESD5V0U5BV,115/1727-5806-1-ND"/>
@@ -13846,7 +13846,7 @@ Various fiducial points for machine vision alignment.</description>
 </part>
 <part name="GND6" library="supply1" deviceset="GND" device=""/>
 <part name="GND30" library="supply1" deviceset="GND" device=""/>
-<part name="X8" library="USB30-MICROB" deviceset="USB3.0-MICROB" device="" value="ZX360D-B-10P(30)">
+<part name="X10" library="USB30-MICROB" deviceset="USB3.0-MICROB" device="" value="ZX360D-B-10P(30)">
 <attribute name="CLASS" value="CAPACITOR"/>
 <attribute name="DESCRIPTION" value="CONN RCPT USB3.0 MICRO B SMD R/A"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/hirose-electric-co-ltd/ZX360D-B-10P-30/H125269DKR-ND"/>
@@ -13903,7 +13903,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="1276-1005-1-ND"/>
 </part>
-<part name="R2" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="10k">
+<part name="R3" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="10k">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/10W 0603"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RMCF0603FT10K0/RMCF0603FT10K0CT-ND"/>
@@ -13953,7 +13953,7 @@ Various fiducial points for machine vision alignment.</description>
 <part name="GND32" library="supply1" deviceset="GND" device=""/>
 <part name="GND33" library="supply1" deviceset="GND" device=""/>
 <part name="GND34" library="supply1" deviceset="GND" device=""/>
-<part name="D4" library="diodes-sysmocom" deviceset="DIODE-TVS" device="-SMB" value="SMBJP6KE6.8A-TP">
+<part name="D3" library="diodes-sysmocom" deviceset="DIODE-TVS" device="-SMB" value="SMBJP6KE6.8A-TP">
 <attribute name="CLASS" value="DIODE"/>
 <attribute name="DESCRIPTION" value="TVS DIODE 5.8V 10.5V DO214AA"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/micro-commercial-co/SMBJP6KE6.8A-TP/SMBJP6KE6.8A-TPMSCT-ND"/>
@@ -13975,7 +13975,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="RMCF0603FT10K0CT-ND"/>
 </part>
-<part name="D3" library="diodes-sysmocom" deviceset="DIODE-SCHOTTKY" device="-SMB" value="SD2114S040S5R0">
+<part name="D2" library="diodes-sysmocom" deviceset="DIODE-SCHOTTKY" device="-SMB" value="SD2114S040S5R0">
 <attribute name="CLASS" value="DIODE"/>
 <attribute name="DESCRIPTION" value="DIODE SCHOTTKY 40V 5A SMB"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/avx-corporation/SD2114S040S5R0/478-7816-1-ND"/>
@@ -13986,7 +13986,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="478-7816-1-ND"/>
 </part>
-<part name="JP1" library="laforge" deviceset="PINHD-2X10" device="">
+<part name="X3" library="laforge" deviceset="PINHD-2X10" device="">
 <attribute name="CLASS" value="CONNECTOR\JUMPER"/>
 <attribute name="DESCRIPTION" value="NO DESCRIPTION"/>
 <attribute name="LINK" value="UNKNOWN LINK"/>
@@ -13997,7 +13997,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="UNKNOWN SOURCE"/>
 <attribute name="SOURCEPARTNUMBER" value="UNKNOWN SOURCE PART NUMBER"/>
 </part>
-<part name="JP2" library="SparkFun" deviceset="FIDUCIAL" device="UFIDUCIAL">
+<part name="JP1" library="SparkFun" deviceset="FIDUCIAL" device="UFIDUCIAL">
 <attribute name="CLASS" value="CONNECTOR\JUMPER"/>
 <attribute name="DESCRIPTION" value="NO DESCRIPTION"/>
 <attribute name="LINK" value="UNKNOWN LINK"/>
@@ -14008,7 +14008,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="UNKNOWN SOURCE"/>
 <attribute name="SOURCEPARTNUMBER" value="UNKNOWN SOURCE PART NUMBER"/>
 </part>
-<part name="JP3" library="SparkFun" deviceset="FIDUCIAL" device="UFIDUCIAL">
+<part name="JP2" library="SparkFun" deviceset="FIDUCIAL" device="UFIDUCIAL">
 <attribute name="CLASS" value="CONNECTOR\JUMPER"/>
 <attribute name="DESCRIPTION" value="NO DESCRIPTION"/>
 <attribute name="LINK" value="UNKNOWN LINK"/>
@@ -14019,7 +14019,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="UNKNOWN SOURCE"/>
 <attribute name="SOURCEPARTNUMBER" value="UNKNOWN SOURCE PART NUMBER"/>
 </part>
-<part name="R10" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="100k">
+<part name="R9" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="100k">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES SMD 100K OHM 1%% 1/10W 0603"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/vishay-dale/CRCW0603100KFKEA/541-100KHCT-ND"/>
@@ -14031,7 +14031,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCEPARTNUMBER" value="541-100KHCT-ND"/>
 </part>
 <part name="GND35" library="supply1" deviceset="GND" device=""/>
-<part name="R21" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="4.7k">
+<part name="R20" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="4.7k">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES SMD 4.7K OHM 5% 1/10W 0603"/>
 <attribute name="LINK" value="http://www.digikey.de/product-detail/de/RC0603JR-074K7L/311-4.7KGRCT-ND"/>
@@ -14042,7 +14042,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="311-4.7KGRCT-ND"/>
 </part>
-<part name="R14" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="47k">
+<part name="R21" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="47k">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES 47K OHM 1%% 1/10W 0603"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RMCF0603FT47K0/RMCF0603FT47K0CT-ND"/>
@@ -14064,7 +14064,7 @@ Various fiducial points for machine vision alignment.</description>
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="311-4.7KGRCT-ND"/>
 </part>
-<part name="R6" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="47k">
+<part name="R12" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="47k">
 <attribute name="CLASS" value="RESISTOR"/>
 <attribute name="DESCRIPTION" value="RES 47K OHM 1%% 1/10W 0603"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RMCF0603FT47K0/RMCF0603FT47K0CT-ND"/>
@@ -14077,7 +14077,7 @@ Various fiducial points for machine vision alignment.</description>
 </part>
 <part name="GND21" library="supply1" deviceset="GND" device=""/>
 <part name="GND28" library="supply1" deviceset="GND" device=""/>
-<part name="X9" library="laforge" deviceset="PINHD-2X5" device=""/>
+<part name="X4" library="laforge" deviceset="PINHD-2X5" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -14142,7 +14142,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="38.1" y="55.88" size="1.778" layer="96" rot="R180" display="off"/>
 <attribute name="LINK" x="38.1" y="55.88" size="1.778" layer="96" rot="R180" display="off"/>
 </instance>
-<instance part="R18" gate="G$1" x="177.8" y="76.2" smashed="yes">
+<instance part="R16" gate="G$1" x="177.8" y="76.2" smashed="yes">
 <attribute name="DESCRIPTION" x="177.8" y="76.2" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURER" x="177.8" y="76.2" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="177.8" y="76.2" size="1.778" layer="96" display="off"/>
@@ -14155,7 +14155,7 @@ SIM Card Slot</text>
 <attribute name="NAME" x="171.45" y="74.168" size="1.27" layer="95"/>
 <attribute name="VALUE" x="181.356" y="74.295" size="1.27" layer="96"/>
 </instance>
-<instance part="R15" gate="G$1" x="170.18" y="78.74" smashed="yes">
+<instance part="R14" gate="G$1" x="170.18" y="78.74" smashed="yes">
 <attribute name="DESCRIPTION" x="170.18" y="78.74" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURER" x="170.18" y="78.74" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="170.18" y="78.74" size="1.778" layer="96" display="off"/>
@@ -14168,7 +14168,7 @@ SIM Card Slot</text>
 <attribute name="NAME" x="176.53" y="78.74" size="1.27" layer="95"/>
 <attribute name="VALUE" x="182.118" y="78.867" size="1.27" layer="96"/>
 </instance>
-<instance part="R17" gate="G$1" x="177.8" y="81.28" smashed="yes">
+<instance part="R15" gate="G$1" x="177.8" y="81.28" smashed="yes">
 <attribute name="NAME" x="173.736" y="84.328" size="1.27" layer="95"/>
 <attribute name="VALUE" x="180.086" y="84.455" size="1.27" layer="96"/>
 <attribute name="DESCRIPTION" x="177.8" y="81.28" size="1.27" layer="96" rot="R180" display="off"/>
@@ -14219,7 +14219,7 @@ SIM Card Slot</text>
 <attribute name="VALUE" x="318.008" y="230.124" size="1.27" layer="96" rot="R90"/>
 </instance>
 <instance part="GND4" gate="1" x="299.72" y="220.98"/>
-<instance part="X3" gate="G$1" x="231.14" y="243.84" smashed="yes">
+<instance part="X5" gate="G$1" x="231.14" y="243.84" smashed="yes">
 <attribute name="DESCRIPTION" x="231.14" y="243.84" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURER" x="231.14" y="243.84" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="231.14" y="243.84" size="1.778" layer="96" display="off"/>
@@ -14232,7 +14232,7 @@ SIM Card Slot</text>
 <attribute name="NAME" x="223.52" y="246.38" size="1.778" layer="95"/>
 <attribute name="VALUE" x="220.98" y="228.6" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="X4" gate="1" x="251.46" y="236.22" rot="R90">
+<instance part="X6" gate="1" x="251.46" y="236.22" rot="R90">
 <attribute name="DESCRIPTION" x="251.46" y="236.22" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURER" x="251.46" y="236.22" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="251.46" y="236.22" size="1.778" layer="96" display="off"/>
@@ -14495,7 +14495,7 @@ SIM Card Slot</text>
 <attribute name="POPULATED" x="353.06" y="40.64" size="1.778" layer="96" display="off"/>
 <attribute name="CLASS" x="353.06" y="40.64" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="R3" gate="G$1" x="50.8" y="55.88">
+<instance part="R2" gate="G$1" x="50.8" y="55.88">
 <attribute name="DESCRIPTION" x="50.8" y="55.88" size="1.778" layer="96" rot="R270" display="off"/>
 <attribute name="MANUFACTURER" x="50.8" y="55.88" size="1.778" layer="96" rot="R270" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="50.8" y="55.88" size="1.778" layer="96" rot="R270" display="off"/>
@@ -14506,7 +14506,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="50.8" y="55.88" size="1.778" layer="96" rot="R270" display="off"/>
 <attribute name="LINK" x="50.8" y="55.88" size="1.778" layer="96" rot="R270" display="off"/>
 </instance>
-<instance part="X5" gate="G" x="256.54" y="165.1">
+<instance part="X7" gate="G" x="256.54" y="165.1">
 <attribute name="DESCRIPTION" x="256.54" y="165.1" size="3.81" layer="96" rot="MR0" display="off"/>
 <attribute name="MANUFACTURER" x="256.54" y="165.1" size="3.81" layer="96" rot="MR0" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="256.54" y="165.1" size="3.81" layer="96" rot="MR0" display="off"/>
@@ -14517,7 +14517,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="256.54" y="165.1" size="3.81" layer="96" rot="MR0" display="off"/>
 <attribute name="LINK" x="256.54" y="165.1" size="3.81" layer="96" rot="MR0" display="off"/>
 </instance>
-<instance part="X6" gate="G" x="256.54" y="139.7">
+<instance part="X8" gate="G" x="256.54" y="139.7">
 <attribute name="DESCRIPTION" x="256.54" y="139.7" size="3.81" layer="96" rot="MR0" display="off"/>
 <attribute name="MANUFACTURER" x="256.54" y="139.7" size="3.81" layer="96" rot="MR0" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="256.54" y="139.7" size="3.81" layer="96" rot="MR0" display="off"/>
@@ -14530,7 +14530,7 @@ SIM Card Slot</text>
 </instance>
 <instance part="GND14" gate="1" x="261.62" y="149.86"/>
 <instance part="GND15" gate="1" x="261.62" y="124.46"/>
-<instance part="X7" gate="G" x="256.54" y="111.76">
+<instance part="X9" gate="G" x="256.54" y="111.76">
 <attribute name="DESCRIPTION" x="256.54" y="111.76" size="3.81" layer="96" rot="MR0" display="off"/>
 <attribute name="MANUFACTURER" x="256.54" y="111.76" size="3.81" layer="96" rot="MR0" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="256.54" y="111.76" size="3.81" layer="96" rot="MR0" display="off"/>
@@ -14630,7 +14630,7 @@ SIM Card Slot</text>
 <attribute name="VALUE" x="85.852" y="203.2" size="1.27" layer="96" rot="MR90"/>
 </instance>
 <instance part="GND22" gate="1" x="81.28" y="193.04"/>
-<instance part="R9" gate="G$1" x="76.2" y="203.2" rot="R90">
+<instance part="R8" gate="G$1" x="76.2" y="203.2" rot="R90">
 <attribute name="DESCRIPTION" x="76.2" y="203.2" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURER" x="76.2" y="203.2" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="76.2" y="203.2" size="1.778" layer="96" display="off"/>
@@ -14652,7 +14652,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="340.36" y="86.36" size="1.778" layer="96" display="off"/>
 <attribute name="LINK" x="340.36" y="86.36" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="R20" gate="G$1" x="203.2" y="99.06" smashed="yes">
+<instance part="R18" gate="G$1" x="203.2" y="99.06" smashed="yes">
 <attribute name="DESCRIPTION" x="203.2" y="99.06" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURER" x="203.2" y="99.06" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="203.2" y="99.06" size="1.778" layer="96" display="off"/>
@@ -14678,7 +14678,7 @@ SIM Card Slot</text>
 <attribute name="NAME" x="196.85" y="94.742" size="1.27" layer="95"/>
 <attribute name="VALUE" x="207.01" y="94.615" size="1.27" layer="96"/>
 </instance>
-<instance part="R16" gate="G$1" x="203.2" y="101.6" smashed="yes">
+<instance part="R17" gate="G$1" x="203.2" y="101.6" smashed="yes">
 <attribute name="DESCRIPTION" x="203.2" y="101.6" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURER" x="203.2" y="101.6" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="203.2" y="101.6" size="1.778" layer="96" display="off"/>
@@ -14775,7 +14775,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="66.04" y="40.64" size="1.778" layer="96" rot="R90" display="off"/>
 <attribute name="LINK" x="66.04" y="40.64" size="1.778" layer="96" rot="R90" display="off"/>
 </instance>
-<instance part="R8" gate="G$1" x="71.12" y="25.4" smashed="yes" rot="R180">
+<instance part="R7" gate="G$1" x="71.12" y="25.4" smashed="yes" rot="R180">
 <attribute name="NAME" x="71.12" y="28.702" size="1.27" layer="95" font="vector" rot="R180"/>
 <attribute name="VALUE" x="76.2" y="28.575" size="1.27" layer="96" font="vector" rot="R180"/>
 <attribute name="DESCRIPTION" x="71.12" y="25.4" size="1.778" layer="96" rot="R90" display="off"/>
@@ -14788,7 +14788,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="71.12" y="25.4" size="1.778" layer="96" rot="R90" display="off"/>
 <attribute name="LINK" x="71.12" y="25.4" size="1.778" layer="96" rot="R90" display="off"/>
 </instance>
-<instance part="R7" gate="G$1" x="68.58" y="33.02" smashed="yes" rot="R180">
+<instance part="R6" gate="G$1" x="68.58" y="33.02" smashed="yes" rot="R180">
 <attribute name="NAME" x="68.58" y="36.322" size="1.27" layer="95" font="vector" rot="R180"/>
 <attribute name="VALUE" x="73.66" y="36.195" size="1.27" layer="96" font="vector" rot="R180"/>
 <attribute name="DESCRIPTION" x="68.58" y="33.02" size="1.778" layer="96" rot="R90" display="off"/>
@@ -14801,7 +14801,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="68.58" y="33.02" size="1.778" layer="96" rot="R90" display="off"/>
 <attribute name="LINK" x="68.58" y="33.02" size="1.778" layer="96" rot="R90" display="off"/>
 </instance>
-<instance part="R12" gate="G$1" x="99.06" y="60.96" smashed="yes" rot="R180">
+<instance part="R10" gate="G$1" x="99.06" y="60.96" smashed="yes" rot="R180">
 <attribute name="NAME" x="96.266" y="60.706" size="1.27" layer="95" font="vector" rot="R180"/>
 <attribute name="VALUE" x="107.95" y="61.087" size="1.27" layer="96" font="vector" rot="R180"/>
 <attribute name="DESCRIPTION" x="99.06" y="60.96" size="1.778" layer="96" rot="R90" display="off"/>
@@ -14840,7 +14840,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="149.86" y="147.32" size="1.778" layer="96" rot="R270" display="off"/>
 <attribute name="LINK" x="149.86" y="147.32" size="1.778" layer="96" rot="R270" display="off"/>
 </instance>
-<instance part="D2" gate="G$1" x="248.92" y="25.4">
+<instance part="D4" gate="G$1" x="248.92" y="25.4">
 <attribute name="DESCRIPTION" x="248.92" y="25.4" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURER" x="248.92" y="25.4" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="248.92" y="25.4" size="1.778" layer="96" display="off"/>
@@ -14864,7 +14864,7 @@ SIM Card Slot</text>
 </instance>
 <instance part="GND6" gate="1" x="248.92" y="12.7"/>
 <instance part="GND30" gate="1" x="236.22" y="50.8"/>
-<instance part="X8" gate="G$1" x="342.9" y="119.38" smashed="yes" rot="MR0">
+<instance part="X10" gate="G$1" x="342.9" y="119.38" smashed="yes" rot="MR0">
 <attribute name="NAME" x="350.8375" y="140.335" size="2.1844" layer="95" ratio="12" rot="MR180"/>
 <attribute name="VALUE" x="351.79" y="104.14" size="2.1844" layer="96" ratio="12" rot="MR90"/>
 <attribute name="DESCRIPTION" x="342.9" y="119.38" size="1.27" layer="96" rot="MR180" display="off"/>
@@ -14927,7 +14927,7 @@ SIM Card Slot</text>
 <attribute name="NAME" x="244.856" y="188.468" size="1.27" layer="95" rot="MR90"/>
 <attribute name="VALUE" x="245.872" y="193.04" size="1.27" layer="96" rot="MR90"/>
 </instance>
-<instance part="R2" gate="G$1" x="53.34" y="96.52" smashed="yes">
+<instance part="R3" gate="G$1" x="53.34" y="96.52" smashed="yes">
 <attribute name="NAME" x="51.816" y="98.298" size="1.27" layer="95" font="vector"/>
 <attribute name="VALUE" x="50.8" y="93.345" size="1.27" layer="96" font="vector"/>
 <attribute name="DESCRIPTION" x="53.34" y="96.52" size="1.778" layer="96" rot="R270" display="off"/>
@@ -14982,7 +14982,7 @@ SIM Card Slot</text>
 <instance part="GND32" gate="1" x="269.24" y="124.46"/>
 <instance part="GND33" gate="1" x="269.24" y="96.52"/>
 <instance part="GND34" gate="1" x="269.24" y="149.86"/>
-<instance part="D4" gate="G$1" x="243.84" y="238.76" smashed="yes" rot="R90">
+<instance part="D3" gate="G$1" x="243.84" y="238.76" smashed="yes" rot="R90">
 <attribute name="NAME" x="243.078" y="224.409" size="1.778" layer="95"/>
 <attribute name="VALUE" x="243.078" y="222.123" size="1.778" layer="96"/>
 <attribute name="DESCRIPTION" x="243.84" y="238.76" size="1.778" layer="96" rot="MR90" display="off"/>
@@ -15008,7 +15008,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="66.04" y="48.26" size="1.778" layer="96" rot="R90" display="off"/>
 <attribute name="LINK" x="66.04" y="48.26" size="1.778" layer="96" rot="R90" display="off"/>
 </instance>
-<instance part="D3" gate="G$1" x="238.76" y="243.84" smashed="yes">
+<instance part="D2" gate="G$1" x="238.76" y="243.84" smashed="yes">
 <attribute name="NAME" x="237.49" y="249.047" size="1.778" layer="95"/>
 <attribute name="VALUE" x="237.744" y="246.253" size="1.778" layer="96"/>
 <attribute name="DESCRIPTION" x="238.76" y="243.84" size="1.778" layer="96" display="off"/>
@@ -15021,7 +15021,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="238.76" y="243.84" size="1.778" layer="96" display="off"/>
 <attribute name="LINK" x="238.76" y="243.84" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="JP1" gate="A" x="157.48" y="220.98">
+<instance part="X3" gate="A" x="157.48" y="220.98">
 <attribute name="DESCRIPTION" x="157.48" y="220.98" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURER" x="157.48" y="220.98" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="157.48" y="220.98" size="1.778" layer="96" display="off"/>
@@ -15032,7 +15032,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="157.48" y="220.98" size="1.778" layer="96" display="off"/>
 <attribute name="LINK" x="157.48" y="220.98" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="JP2" gate="G$1" x="276.86" y="7.62">
+<instance part="JP1" gate="G$1" x="276.86" y="7.62">
 <attribute name="DESCRIPTION" x="276.86" y="7.62" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURER" x="276.86" y="7.62" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="276.86" y="7.62" size="1.778" layer="96" display="off"/>
@@ -15043,7 +15043,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="276.86" y="7.62" size="1.778" layer="96" display="off"/>
 <attribute name="LINK" x="276.86" y="7.62" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="JP3" gate="G$1" x="281.94" y="7.62">
+<instance part="JP2" gate="G$1" x="281.94" y="7.62">
 <attribute name="DESCRIPTION" x="281.94" y="7.62" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURER" x="281.94" y="7.62" size="1.778" layer="96" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="281.94" y="7.62" size="1.778" layer="96" display="off"/>
@@ -15054,7 +15054,7 @@ SIM Card Slot</text>
 <attribute name="CLASS" x="281.94" y="7.62" size="1.778" layer="96" display="off"/>
 <attribute name="LINK" x="281.94" y="7.62" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="R10" gate="G$1" x="76.2" y="73.66" smashed="yes" rot="R90">
+<instance part="R9" gate="G$1" x="76.2" y="73.66" smashed="yes" rot="R90">
 <attribute name="NAME" x="73.914" y="73.66" size="1.27" layer="95" rot="R90"/>
 <attribute name="VALUE" x="79.375" y="71.12" size="1.27" layer="96" rot="R90"/>
 <attribute name="DESCRIPTION" x="76.2" y="73.66" size="1.778" layer="96" display="off"/>
@@ -15068,7 +15068,7 @@ SIM Card Slot</text>
 <attribute name="LINK" x="76.2" y="73.66" size="1.778" layer="96" display="off"/>
 </instance>
 <instance part="GND35" gate="1" x="76.2" y="66.04"/>
-<instance part="R21" gate="G$1" x="218.44" y="157.48" smashed="yes" rot="R270">
+<instance part="R20" gate="G$1" x="218.44" y="157.48" smashed="yes" rot="R270">
 <attribute name="SOURCE" x="218.44" y="157.48" size="1.778" layer="96" rot="R180" display="off"/>
 <attribute name="LINK" x="218.44" y="157.48" size="1.778" layer="96" rot="R180" display="off"/>
 <attribute name="DESCRIPTION" x="218.44" y="157.48" size="1.778" layer="96" rot="R180" display="off"/>
@@ -15081,7 +15081,7 @@ SIM Card Slot</text>
 <attribute name="NAME" x="215.646" y="157.48" size="1.27" layer="95" rot="R270"/>
 <attribute name="VALUE" x="216.789" y="160.02" size="1.27" layer="96" rot="R90"/>
 </instance>
-<instance part="R14" gate="G$1" x="218.44" y="132.08" smashed="yes" rot="MR90">
+<instance part="R21" gate="G$1" x="218.44" y="132.08" smashed="yes" rot="MR90">
 <attribute name="DESCRIPTION" x="218.44" y="132.08" size="1.778" layer="96" rot="R90" display="off"/>
 <attribute name="MANUFACTURER" x="218.44" y="132.08" size="1.778" layer="96" rot="R90" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="218.44" y="132.08" size="1.778" layer="96" rot="R90" display="off"/>
@@ -15107,7 +15107,7 @@ SIM Card Slot</text>
 <attribute name="NAME" x="105.664" y="157.734" size="1.27" layer="95" rot="R270"/>
 <attribute name="VALUE" x="107.061" y="159.766" size="1.27" layer="96" rot="R90"/>
 </instance>
-<instance part="R6" gate="G$1" x="109.22" y="132.08" rot="MR90">
+<instance part="R12" gate="G$1" x="109.22" y="132.08" rot="MR90">
 <attribute name="DESCRIPTION" x="109.22" y="132.08" size="1.778" layer="96" rot="R90" display="off"/>
 <attribute name="MANUFACTURER" x="109.22" y="132.08" size="1.778" layer="96" rot="R90" display="off"/>
 <attribute name="MANUFACTURERPARTNUMBER" x="109.22" y="132.08" size="1.778" layer="96" rot="R90" display="off"/>
@@ -15120,7 +15120,7 @@ SIM Card Slot</text>
 </instance>
 <instance part="GND21" gate="1" x="109.22" y="124.46"/>
 <instance part="GND28" gate="1" x="218.44" y="124.46"/>
-<instance part="X9" gate="A" x="185.42" y="101.6"/>
+<instance part="X4" gate="A" x="185.42" y="101.6"/>
 </instances>
 <busses>
 </busses>
@@ -15152,15 +15152,15 @@ SIM Card Slot</text>
 <junction x="314.96" y="223.52"/>
 </segment>
 <segment>
-<pinref part="X3" gate="G$1" pin="3"/>
+<pinref part="X5" gate="G$1" pin="3"/>
 <wire x1="231.14" y1="241.3" x2="233.68" y2="241.3" width="0.1524" layer="91"/>
 <wire x1="233.68" y1="241.3" x2="233.68" y2="238.76" width="0.1524" layer="91"/>
-<pinref part="X3" gate="G$1" pin="2"/>
+<pinref part="X5" gate="G$1" pin="2"/>
 <wire x1="233.68" y1="238.76" x2="233.68" y2="236.22" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="238.76" x2="233.68" y2="238.76" width="0.1524" layer="91"/>
 <pinref part="GND5" gate="1" pin="GND"/>
 <junction x="233.68" y="238.76"/>
-<pinref part="D4" gate="G$1" pin="A"/>
+<pinref part="D3" gate="G$1" pin="A"/>
 <wire x1="243.84" y1="236.22" x2="233.68" y2="236.22" width="0.1524" layer="91"/>
 <junction x="233.68" y="236.22"/>
 </segment>
@@ -15249,12 +15249,12 @@ SIM Card Slot</text>
 <segment>
 <wire x1="335.28" y1="109.22" x2="320.04" y2="109.22" width="0.1524" layer="91"/>
 <pinref part="GND19" gate="1" pin="GND"/>
-<pinref part="X8" gate="G$1" pin="GND@1"/>
+<pinref part="X10" gate="G$1" pin="GND@1"/>
 </segment>
 <segment>
 <wire x1="335.28" y1="124.46" x2="322.58" y2="124.46" width="0.1524" layer="91"/>
 <pinref part="GND20" gate="1" pin="GND"/>
-<pinref part="X8" gate="G$1" pin="GND@0"/>
+<pinref part="X10" gate="G$1" pin="GND@0"/>
 </segment>
 <segment>
 <wire x1="76.2" y1="198.12" x2="76.2" y2="195.58" width="0.1524" layer="91"/>
@@ -15264,7 +15264,7 @@ SIM Card Slot</text>
 <wire x1="83.82" y1="195.58" x2="83.82" y2="200.66" width="0.1524" layer="91"/>
 <pinref part="GND22" gate="1" pin="GND"/>
 <junction x="81.28" y="195.58"/>
-<pinref part="R9" gate="G$1" pin="1"/>
+<pinref part="R8" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="SIM2" gate="-CARD" pin="GND"/>
@@ -15288,7 +15288,7 @@ SIM Card Slot</text>
 <pinref part="GND27" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="D2" gate="G$1" pin="GND"/>
+<pinref part="D4" gate="G$1" pin="GND"/>
 <pinref part="GND6" gate="1" pin="GND"/>
 </segment>
 <segment>
@@ -15323,21 +15323,21 @@ SIM Card Slot</text>
 <segment>
 <pinref part="GND1" gate="1" pin="GND"/>
 <wire x1="167.64" y1="231.14" x2="162.56" y2="231.14" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="2"/>
+<pinref part="X3" gate="A" pin="2"/>
 </segment>
 <segment>
-<pinref part="X5" gate="G" pin="GND@1"/>
+<pinref part="X7" gate="G" pin="GND@1"/>
 <wire x1="259.08" y1="170.18" x2="261.62" y2="170.18" width="0.1524" layer="91"/>
 <wire x1="261.62" y1="170.18" x2="261.62" y2="167.64" width="0.1524" layer="91"/>
-<pinref part="X5" gate="G" pin="GND@2"/>
+<pinref part="X7" gate="G" pin="GND@2"/>
 <wire x1="261.62" y1="167.64" x2="259.08" y2="167.64" width="0.1524" layer="91"/>
-<pinref part="X5" gate="G" pin="GND@3"/>
+<pinref part="X7" gate="G" pin="GND@3"/>
 <wire x1="259.08" y1="162.56" x2="261.62" y2="162.56" width="0.1524" layer="91"/>
 <wire x1="261.62" y1="162.56" x2="261.62" y2="167.64" width="0.1524" layer="91"/>
 <junction x="261.62" y="167.64"/>
 <wire x1="261.62" y1="162.56" x2="261.62" y2="160.02" width="0.1524" layer="91"/>
 <junction x="261.62" y="162.56"/>
-<pinref part="X5" gate="G" pin="GND@4"/>
+<pinref part="X7" gate="G" pin="GND@4"/>
 <wire x1="261.62" y1="160.02" x2="259.08" y2="160.02" width="0.1524" layer="91"/>
 <pinref part="GND14" gate="1" pin="GND"/>
 <wire x1="261.62" y1="152.4" x2="261.62" y2="160.02" width="0.1524" layer="91"/>
@@ -15358,16 +15358,16 @@ SIM Card Slot</text>
 <junction x="276.86" y="160.02"/>
 </segment>
 <segment>
-<pinref part="X7" gate="G" pin="GND@1"/>
+<pinref part="X9" gate="G" pin="GND@1"/>
 <wire x1="259.08" y1="116.84" x2="261.62" y2="116.84" width="0.1524" layer="91"/>
 <wire x1="261.62" y1="116.84" x2="261.62" y2="114.3" width="0.1524" layer="91"/>
-<pinref part="X7" gate="G" pin="GND@2"/>
+<pinref part="X9" gate="G" pin="GND@2"/>
 <wire x1="261.62" y1="114.3" x2="259.08" y2="114.3" width="0.1524" layer="91"/>
-<pinref part="X7" gate="G" pin="GND@3"/>
+<pinref part="X9" gate="G" pin="GND@3"/>
 <wire x1="259.08" y1="109.22" x2="261.62" y2="109.22" width="0.1524" layer="91"/>
 <wire x1="261.62" y1="109.22" x2="261.62" y2="114.3" width="0.1524" layer="91"/>
 <junction x="261.62" y="114.3"/>
-<pinref part="X7" gate="G" pin="GND@4"/>
+<pinref part="X9" gate="G" pin="GND@4"/>
 <wire x1="259.08" y1="106.68" x2="261.62" y2="106.68" width="0.1524" layer="91"/>
 <wire x1="261.62" y1="106.68" x2="261.62" y2="109.22" width="0.1524" layer="91"/>
 <junction x="261.62" y="109.22"/>
@@ -15390,16 +15390,16 @@ SIM Card Slot</text>
 <junction x="276.86" y="106.68"/>
 </segment>
 <segment>
-<pinref part="X6" gate="G" pin="GND@1"/>
+<pinref part="X8" gate="G" pin="GND@1"/>
 <wire x1="259.08" y1="144.78" x2="261.62" y2="144.78" width="0.1524" layer="91"/>
-<pinref part="X6" gate="G" pin="GND@4"/>
+<pinref part="X8" gate="G" pin="GND@4"/>
 <wire x1="259.08" y1="134.62" x2="261.62" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="261.62" y1="134.62" x2="261.62" y2="137.16" width="0.1524" layer="91"/>
-<pinref part="X6" gate="G" pin="GND@3"/>
+<pinref part="X8" gate="G" pin="GND@3"/>
 <wire x1="261.62" y1="137.16" x2="259.08" y2="137.16" width="0.1524" layer="91"/>
 <wire x1="261.62" y1="137.16" x2="261.62" y2="142.24" width="0.1524" layer="91"/>
 <junction x="261.62" y="137.16"/>
-<pinref part="X6" gate="G" pin="GND@2"/>
+<pinref part="X8" gate="G" pin="GND@2"/>
 <wire x1="261.62" y1="142.24" x2="259.08" y2="142.24" width="0.1524" layer="91"/>
 <wire x1="261.62" y1="144.78" x2="261.62" y2="142.24" width="0.1524" layer="91"/>
 <junction x="261.62" y="142.24"/>
@@ -15434,15 +15434,15 @@ SIM Card Slot</text>
 <pinref part="GND34" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="R10" gate="G$1" pin="1"/>
+<pinref part="R9" gate="G$1" pin="1"/>
 <pinref part="GND35" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="R6" gate="G$1" pin="1"/>
+<pinref part="R12" gate="G$1" pin="1"/>
 <pinref part="GND21" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="R14" gate="G$1" pin="1"/>
+<pinref part="R21" gate="G$1" pin="1"/>
 <pinref part="GND28" gate="1" pin="GND"/>
 </segment>
 </net>
@@ -15481,7 +15481,7 @@ SIM Card Slot</text>
 <wire x1="76.2" y1="137.16" x2="76.2" y2="134.62" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="R18" gate="G$1" pin="2"/>
+<pinref part="R16" gate="G$1" pin="2"/>
 <wire x1="182.88" y1="76.2" x2="185.42" y2="76.2" width="0.1524" layer="91"/>
 <label x="185.42" y="76.2" size="1.27" layer="95" xref="yes"/>
 </segment>
@@ -15502,7 +15502,7 @@ SIM Card Slot</text>
 <wire x1="43.18" y1="137.16" x2="43.18" y2="134.62" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="R15" gate="G$1" pin="2"/>
+<pinref part="R14" gate="G$1" pin="2"/>
 <wire x1="175.26" y1="78.74" x2="185.42" y2="78.74" width="0.1524" layer="91"/>
 <label x="185.42" y="78.74" size="1.27" layer="95" xref="yes"/>
 </segment>
@@ -15518,7 +15518,7 @@ SIM Card Slot</text>
 <wire x1="38.1" y1="139.7" x2="38.1" y2="134.62" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="R17" gate="G$1" pin="2"/>
+<pinref part="R15" gate="G$1" pin="2"/>
 <wire x1="182.88" y1="81.28" x2="185.42" y2="81.28" width="0.1524" layer="91"/>
 <label x="185.42" y="81.28" size="1.27" layer="95" xref="yes"/>
 </segment>
@@ -15587,7 +15587,7 @@ SIM Card Slot</text>
 <segment>
 <label x="142.24" y="231.14" size="1.27" layer="95" rot="R180" xref="yes"/>
 <wire x1="142.24" y1="231.14" x2="154.94" y2="231.14" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="1"/>
+<pinref part="X3" gate="A" pin="1"/>
 </segment>
 <segment>
 <pinref part="LED1" gate="G$1" pin="A"/>
@@ -15620,7 +15620,7 @@ SIM Card Slot</text>
 <wire x1="81.28" y1="45.72" x2="81.28" y2="25.4" width="0.1524" layer="91"/>
 <wire x1="81.28" y1="25.4" x2="81.28" y2="22.86" width="0.1524" layer="91"/>
 <pinref part="NGFF1" gate="G$1" pin="!RESET"/>
-<pinref part="R8" gate="G$1" pin="1"/>
+<pinref part="R7" gate="G$1" pin="1"/>
 <wire x1="81.28" y1="22.86" x2="63.5" y2="22.86" width="0.1524" layer="91"/>
 <label x="63.5" y="22.86" size="1.27" layer="95" rot="R180" xref="yes"/>
 <wire x1="76.2" y1="25.4" x2="81.28" y2="25.4" width="0.1524" layer="91"/>
@@ -15636,7 +15636,7 @@ SIM Card Slot</text>
 <segment>
 <wire x1="109.22" y1="58.42" x2="104.14" y2="58.42" width="0.1524" layer="91"/>
 <pinref part="NGFF1" gate="G$1" pin="!W_DISABLE"/>
-<pinref part="R12" gate="G$1" pin="1"/>
+<pinref part="R10" gate="G$1" pin="1"/>
 <wire x1="104.14" y1="58.42" x2="91.44" y2="58.42" width="0.1524" layer="91"/>
 <wire x1="104.14" y1="60.96" x2="104.14" y2="58.42" width="0.1524" layer="91"/>
 <junction x="104.14" y="58.42"/>
@@ -15650,7 +15650,7 @@ SIM Card Slot</text>
 </net>
 <net name="_USIM1_DATA" class="0">
 <segment>
-<pinref part="R18" gate="G$1" pin="1"/>
+<pinref part="R16" gate="G$1" pin="1"/>
 <wire x1="162.56" y1="76.2" x2="172.72" y2="76.2" width="0.1524" layer="91"/>
 <pinref part="NGFF1" gate="G$1" pin="UIM_DATA"/>
 <label x="163.576" y="76.708" size="0.8128" layer="95"/>
@@ -15663,7 +15663,7 @@ SIM Card Slot</text>
 </net>
 <net name="_!USIM1_RESET" class="0">
 <segment>
-<pinref part="R17" gate="G$1" pin="1"/>
+<pinref part="R15" gate="G$1" pin="1"/>
 <wire x1="162.56" y1="81.28" x2="172.72" y2="81.28" width="0.1524" layer="91"/>
 <pinref part="NGFF1" gate="G$1" pin="!UIM_RESET"/>
 <label x="163.83" y="81.788" size="0.8128" layer="95"/>
@@ -15682,7 +15682,7 @@ SIM Card Slot</text>
 <wire x1="347.98" y1="93.98" x2="347.98" y2="91.44" width="0.1524" layer="91"/>
 <wire x1="340.36" y1="93.98" x2="340.36" y2="91.44" width="0.1524" layer="91"/>
 <pinref part="R22" gate="G$1" pin="2"/>
-<pinref part="X8" gate="G$1" pin="S1"/>
+<pinref part="X10" gate="G$1" pin="S1"/>
 <wire x1="342.9" y1="96.52" x2="342.9" y2="93.98" width="0.1524" layer="91"/>
 <junction x="342.9" y="93.98"/>
 </segment>
@@ -15698,18 +15698,18 @@ SIM Card Slot</text>
 <pinref part="C11" gate="G$1" pin="+"/>
 <wire x1="271.78" y1="236.22" x2="271.78" y2="233.68" width="0.1524" layer="91"/>
 <junction x="271.78" y="236.22"/>
-<pinref part="X4" gate="1" pin="2"/>
+<pinref part="X6" gate="1" pin="2"/>
 <wire x1="254" y1="236.22" x2="271.78" y2="236.22" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$12" class="3">
 <segment>
 <wire x1="256.54" y1="243.84" x2="256.54" y2="238.76" width="0.1524" layer="91"/>
-<pinref part="X4" gate="1" pin="3"/>
+<pinref part="X6" gate="1" pin="3"/>
 <wire x1="256.54" y1="238.76" x2="254" y2="238.76" width="0.1524" layer="91"/>
-<pinref part="D3" gate="G$1" pin="C"/>
+<pinref part="D2" gate="G$1" pin="C"/>
 <wire x1="241.3" y1="243.84" x2="243.84" y2="243.84" width="0.1524" layer="91"/>
-<pinref part="D4" gate="G$1" pin="C"/>
+<pinref part="D3" gate="G$1" pin="C"/>
 <wire x1="243.84" y1="243.84" x2="243.84" y2="241.3" width="0.1524" layer="91"/>
 <wire x1="256.54" y1="243.84" x2="243.84" y2="243.84" width="0.1524" layer="91"/>
 <junction x="243.84" y="243.84"/>
@@ -15717,7 +15717,7 @@ SIM Card Slot</text>
 </net>
 <net name="USB_VBUS" class="3">
 <segment>
-<pinref part="X4" gate="1" pin="1"/>
+<pinref part="X6" gate="1" pin="1"/>
 <wire x1="254" y1="233.68" x2="256.54" y2="233.68" width="0.1524" layer="91"/>
 <wire x1="256.54" y1="233.68" x2="256.54" y2="228.6" width="0.1524" layer="91"/>
 <wire x1="256.54" y1="228.6" x2="236.22" y2="228.6" width="0.1524" layer="91"/>
@@ -15726,7 +15726,7 @@ SIM Card Slot</text>
 <segment>
 <wire x1="335.28" y1="134.62" x2="332.74" y2="134.62" width="0.1524" layer="91"/>
 <label x="332.74" y="134.62" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="X8" gate="G$1" pin="VBUS"/>
+<pinref part="X10" gate="G$1" pin="VBUS"/>
 </segment>
 </net>
 <net name="!WAKE" class="0">
@@ -15750,7 +15750,7 @@ SIM Card Slot</text>
 <segment>
 <label x="175.26" y="213.36" size="1.27" layer="95" xref="yes"/>
 <wire x1="175.26" y1="213.36" x2="162.56" y2="213.36" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="16"/>
+<pinref part="X3" gate="A" pin="16"/>
 </segment>
 </net>
 <net name="COEX2" class="0">
@@ -15762,7 +15762,7 @@ SIM Card Slot</text>
 <segment>
 <label x="142.24" y="215.9" size="1.27" layer="95" rot="R180" xref="yes"/>
 <wire x1="142.24" y1="215.9" x2="154.94" y2="215.9" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="13"/>
+<pinref part="X3" gate="A" pin="13"/>
 </segment>
 </net>
 <net name="!CLKREQ" class="0">
@@ -15774,7 +15774,7 @@ SIM Card Slot</text>
 <segment>
 <label x="142.24" y="220.98" size="1.27" layer="95" rot="R180" xref="yes"/>
 <wire x1="142.24" y1="220.98" x2="154.94" y2="220.98" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="9"/>
+<pinref part="X3" gate="A" pin="9"/>
 </segment>
 </net>
 <net name="REFCLK_N" class="1">
@@ -15805,7 +15805,7 @@ SIM Card Slot</text>
 <segment>
 <label x="142.24" y="226.06" size="1.27" layer="95" rot="R180" xref="yes"/>
 <wire x1="154.94" y1="226.06" x2="142.24" y2="226.06" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="5"/>
+<pinref part="X3" gate="A" pin="5"/>
 </segment>
 <segment>
 <label x="101.6" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
@@ -15817,7 +15817,7 @@ SIM Card Slot</text>
 <segment>
 <label x="142.24" y="228.6" size="1.27" layer="95" rot="R180" xref="yes"/>
 <wire x1="142.24" y1="228.6" x2="154.94" y2="228.6" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="3"/>
+<pinref part="X3" gate="A" pin="3"/>
 </segment>
 <segment>
 <label x="101.6" y="38.1" size="1.27" layer="95" rot="R180" xref="yes"/>
@@ -15829,7 +15829,7 @@ SIM Card Slot</text>
 <segment>
 <label x="142.24" y="223.52" size="1.27" layer="95" rot="R180" xref="yes"/>
 <wire x1="142.24" y1="223.52" x2="154.94" y2="223.52" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="7"/>
+<pinref part="X3" gate="A" pin="7"/>
 </segment>
 <segment>
 <label x="101.6" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
@@ -15841,7 +15841,7 @@ SIM Card Slot</text>
 <segment>
 <label x="175.26" y="223.52" size="1.27" layer="95" xref="yes"/>
 <wire x1="175.26" y1="223.52" x2="162.56" y2="223.52" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="8"/>
+<pinref part="X3" gate="A" pin="8"/>
 </segment>
 <segment>
 <label x="101.6" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
@@ -15858,7 +15858,7 @@ SIM Card Slot</text>
 <segment>
 <label x="175.26" y="218.44" size="1.27" layer="95" xref="yes"/>
 <wire x1="175.26" y1="218.44" x2="162.56" y2="218.44" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="12"/>
+<pinref part="X3" gate="A" pin="12"/>
 </segment>
 </net>
 <net name="SMB_CLK" class="0">
@@ -15870,7 +15870,7 @@ SIM Card Slot</text>
 <segment>
 <label x="142.24" y="218.44" size="1.27" layer="95" rot="R180" xref="yes"/>
 <wire x1="142.24" y1="218.44" x2="154.94" y2="218.44" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="11"/>
+<pinref part="X3" gate="A" pin="11"/>
 </segment>
 </net>
 <net name="_USB_D_N" class="1">
@@ -15887,7 +15887,7 @@ SIM Card Slot</text>
 <segment>
 <wire x1="335.28" y1="132.08" x2="332.74" y2="132.08" width="0.1524" layer="91"/>
 <label x="332.74" y="132.08" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="X8" gate="G$1" pin="D-"/>
+<pinref part="X10" gate="G$1" pin="D-"/>
 </segment>
 </net>
 <net name="_USB_D_P" class="1">
@@ -15904,7 +15904,7 @@ SIM Card Slot</text>
 <segment>
 <wire x1="335.28" y1="129.54" x2="332.74" y2="129.54" width="0.1524" layer="91"/>
 <label x="332.74" y="129.54" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="X8" gate="G$1" pin="D+"/>
+<pinref part="X10" gate="G$1" pin="D+"/>
 </segment>
 </net>
 <net name="N$1" class="0">
@@ -15916,13 +15916,13 @@ SIM Card Slot</text>
 <net name="N$2" class="0">
 <segment>
 <pinref part="LED1" gate="G$1" pin="C"/>
-<pinref part="R3" gate="G$1" pin="1"/>
+<pinref part="R2" gate="G$1" pin="1"/>
 <wire x1="45.72" y1="55.88" x2="43.18" y2="55.88" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$13" class="2">
 <segment>
-<pinref part="X5" gate="G" pin="1"/>
+<pinref part="X7" gate="G" pin="1"/>
 <wire x1="259.08" y1="165.1" x2="269.24" y2="165.1" width="0.1524" layer="91"/>
 <pinref part="Y1" gate="G$1" pin="1"/>
 <pinref part="D5" gate="D$1" pin="P$2"/>
@@ -15932,7 +15932,7 @@ SIM Card Slot</text>
 </net>
 <net name="N$14" class="2">
 <segment>
-<pinref part="X6" gate="G" pin="1"/>
+<pinref part="X8" gate="G" pin="1"/>
 <wire x1="259.08" y1="139.7" x2="269.24" y2="139.7" width="0.1524" layer="91"/>
 <pinref part="Y2" gate="G$1" pin="1"/>
 <pinref part="D6" gate="D$1" pin="P$2"/>
@@ -15942,7 +15942,7 @@ SIM Card Slot</text>
 </net>
 <net name="N$7" class="2">
 <segment>
-<pinref part="X7" gate="G" pin="1"/>
+<pinref part="X9" gate="G" pin="1"/>
 <wire x1="259.08" y1="111.76" x2="269.24" y2="111.76" width="0.1524" layer="91"/>
 <pinref part="Y3" gate="G$1" pin="1"/>
 <pinref part="D7" gate="D$1" pin="P$2"/>
@@ -15964,7 +15964,7 @@ SIM Card Slot</text>
 <segment>
 <wire x1="335.28" y1="114.3" x2="332.74" y2="114.3" width="0.1524" layer="91"/>
 <label x="332.74" y="114.3" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="X8" gate="G$1" pin="TX-"/>
+<pinref part="X10" gate="G$1" pin="TX-"/>
 </segment>
 </net>
 <net name="USB3.0_TX_P" class="1">
@@ -15981,7 +15981,7 @@ SIM Card Slot</text>
 <segment>
 <wire x1="335.28" y1="111.76" x2="332.74" y2="111.76" width="0.1524" layer="91"/>
 <label x="332.74" y="111.76" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="X8" gate="G$1" pin="TX+"/>
+<pinref part="X10" gate="G$1" pin="TX+"/>
 </segment>
 </net>
 <net name="USB3.0_RX_N" class="1">
@@ -15998,7 +15998,7 @@ SIM Card Slot</text>
 <segment>
 <wire x1="335.28" y1="106.68" x2="332.74" y2="106.68" width="0.1524" layer="91"/>
 <label x="332.74" y="106.68" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="X8" gate="G$1" pin="RX-"/>
+<pinref part="X10" gate="G$1" pin="RX-"/>
 </segment>
 </net>
 <net name="USB3.0_RX_P" class="1">
@@ -16015,13 +16015,13 @@ SIM Card Slot</text>
 <segment>
 <wire x1="335.28" y1="104.14" x2="332.74" y2="104.14" width="0.1524" layer="91"/>
 <label x="332.74" y="104.14" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="X8" gate="G$1" pin="RX+"/>
+<pinref part="X10" gate="G$1" pin="RX+"/>
 </segment>
 </net>
 <net name="N$17" class="0">
 <segment>
 <wire x1="335.28" y1="127" x2="332.74" y2="127" width="0.1524" layer="91"/>
-<pinref part="X8" gate="G$1" pin="ID"/>
+<pinref part="X10" gate="G$1" pin="ID"/>
 </segment>
 </net>
 <net name="PCIE_RX_P" class="1">
@@ -16082,7 +16082,7 @@ SIM Card Slot</text>
 <pinref part="SIM1" gate="-DETECT" pin="0@A"/>
 <wire x1="109.22" y1="139.7" x2="109.22" y2="137.16" width="0.1524" layer="91"/>
 <label x="106.68" y="137.16" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="R6" gate="G$1" pin="2"/>
+<pinref part="R12" gate="G$1" pin="2"/>
 <wire x1="109.22" y1="137.16" x2="106.68" y2="137.16" width="0.1524" layer="91"/>
 <junction x="109.22" y="137.16"/>
 </segment>
@@ -16096,7 +16096,7 @@ SIM Card Slot</text>
 <wire x1="76.2" y1="208.28" x2="76.2" y2="210.82" width="0.1524" layer="91"/>
 <wire x1="76.2" y1="210.82" x2="83.82" y2="210.82" width="0.1524" layer="91"/>
 <junction x="83.82" y="210.82"/>
-<pinref part="R9" gate="G$1" pin="2"/>
+<pinref part="R8" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="_USIM2_CLK" class="0">
@@ -16106,7 +16106,7 @@ SIM Card Slot</text>
 <label x="170.18" y="27.94" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="X9" gate="A" pin="9"/>
+<pinref part="X4" gate="A" pin="9"/>
 <wire x1="182.88" y1="96.52" x2="175.26" y2="96.52" width="0.1524" layer="91"/>
 <label x="175.26" y="96.52" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
@@ -16118,7 +16118,7 @@ SIM Card Slot</text>
 <label x="170.18" y="25.4" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="X9" gate="A" pin="5"/>
+<pinref part="X4" gate="A" pin="5"/>
 <wire x1="182.88" y1="101.6" x2="175.26" y2="101.6" width="0.1524" layer="91"/>
 <label x="175.26" y="101.6" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
@@ -16128,12 +16128,12 @@ SIM Card Slot</text>
 <pinref part="SIM2" gate="-DETECT" pin="0@A"/>
 <wire x1="218.44" y1="139.7" x2="218.44" y2="137.16" width="0.1524" layer="91"/>
 <label x="215.9" y="137.16" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="R14" gate="G$1" pin="2"/>
+<pinref part="R21" gate="G$1" pin="2"/>
 <wire x1="218.44" y1="137.16" x2="215.9" y2="137.16" width="0.1524" layer="91"/>
 <junction x="218.44" y="137.16"/>
 </segment>
 <segment>
-<pinref part="X9" gate="A" pin="4"/>
+<pinref part="X4" gate="A" pin="4"/>
 <wire x1="190.5" y1="104.14" x2="198.12" y2="104.14" width="0.1524" layer="91"/>
 <label x="198.12" y="104.14" size="1.27" layer="95" xref="yes"/>
 </segment>
@@ -16153,11 +16153,11 @@ SIM Card Slot</text>
 </segment>
 <segment>
 <label x="264.16" y="22.86" size="1.27" layer="95" xref="yes"/>
-<pinref part="D2" gate="G$1" pin="5"/>
+<pinref part="D4" gate="G$1" pin="5"/>
 <wire x1="264.16" y1="22.86" x2="259.08" y2="22.86" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="X9" gate="A" pin="2"/>
+<pinref part="X4" gate="A" pin="2"/>
 <wire x1="190.5" y1="106.68" x2="198.12" y2="106.68" width="0.1524" layer="91"/>
 <label x="198.12" y="106.68" size="1.27" layer="95" xref="yes"/>
 </segment>
@@ -16169,7 +16169,7 @@ SIM Card Slot</text>
 <label x="170.18" y="17.78" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="X9" gate="A" pin="7"/>
+<pinref part="X4" gate="A" pin="7"/>
 <wire x1="182.88" y1="99.06" x2="175.26" y2="99.06" width="0.1524" layer="91"/>
 <label x="175.26" y="99.06" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
@@ -16191,13 +16191,13 @@ SIM Card Slot</text>
 </segment>
 <segment>
 <label x="233.68" y="22.86" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="D2" gate="G$1" pin="3"/>
+<pinref part="D4" gate="G$1" pin="3"/>
 <wire x1="233.68" y1="22.86" x2="238.76" y2="22.86" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="USIM2_DATA" class="0">
 <segment>
-<pinref part="R16" gate="G$1" pin="2"/>
+<pinref part="R17" gate="G$1" pin="2"/>
 <wire x1="208.28" y1="101.6" x2="213.36" y2="101.6" width="0.1524" layer="91"/>
 <label x="213.36" y="101.6" size="1.27" layer="95" xref="yes"/>
 </segment>
@@ -16217,13 +16217,13 @@ SIM Card Slot</text>
 </segment>
 <segment>
 <label x="248.92" y="38.1" size="1.27" layer="95" rot="R90" xref="yes"/>
-<pinref part="D2" gate="G$1" pin="6"/>
+<pinref part="D4" gate="G$1" pin="6"/>
 <wire x1="248.92" y1="35.56" x2="248.92" y2="38.1" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="!USIM2_RESET" class="0">
 <segment>
-<pinref part="R20" gate="G$1" pin="2"/>
+<pinref part="R18" gate="G$1" pin="2"/>
 <wire x1="208.28" y1="99.06" x2="213.36" y2="99.06" width="0.1524" layer="91"/>
 <label x="213.36" y="99.06" size="1.27" layer="95" xref="yes"/>
 </segment>
@@ -16238,7 +16238,7 @@ SIM Card Slot</text>
 </segment>
 <segment>
 <label x="233.68" y="27.94" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="D2" gate="G$1" pin="1"/>
+<pinref part="D4" gate="G$1" pin="1"/>
 <wire x1="233.68" y1="27.94" x2="238.76" y2="27.94" width="0.1524" layer="91"/>
 </segment>
 </net>
@@ -16251,7 +16251,7 @@ SIM Card Slot</text>
 <segment>
 <label x="142.24" y="213.36" size="1.27" layer="95" rot="R180" xref="yes"/>
 <wire x1="142.24" y1="213.36" x2="154.94" y2="213.36" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="15"/>
+<pinref part="X3" gate="A" pin="15"/>
 </segment>
 </net>
 <net name="ANTCTL1" class="0">
@@ -16263,7 +16263,7 @@ SIM Card Slot</text>
 <segment>
 <label x="175.26" y="210.82" size="1.27" layer="95" xref="yes"/>
 <wire x1="175.26" y1="210.82" x2="162.56" y2="210.82" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="18"/>
+<pinref part="X3" gate="A" pin="18"/>
 </segment>
 </net>
 <net name="ANTCTL2" class="0">
@@ -16275,7 +16275,7 @@ SIM Card Slot</text>
 <segment>
 <label x="142.24" y="210.82" size="1.27" layer="95" rot="R180" xref="yes"/>
 <wire x1="142.24" y1="210.82" x2="154.94" y2="210.82" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="17"/>
+<pinref part="X3" gate="A" pin="17"/>
 </segment>
 </net>
 <net name="ANTCTL3" class="0">
@@ -16287,7 +16287,7 @@ SIM Card Slot</text>
 <segment>
 <label x="175.26" y="208.28" size="1.27" layer="95" xref="yes"/>
 <wire x1="162.56" y1="208.28" x2="175.26" y2="208.28" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="20"/>
+<pinref part="X3" gate="A" pin="20"/>
 </segment>
 </net>
 <net name="COEX3" class="0">
@@ -16299,7 +16299,7 @@ SIM Card Slot</text>
 <segment>
 <label x="175.26" y="215.9" size="1.27" layer="95" xref="yes"/>
 <wire x1="175.26" y1="215.9" x2="162.56" y2="215.9" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="14"/>
+<pinref part="X3" gate="A" pin="14"/>
 </segment>
 </net>
 <net name="PWR_ON" class="0">
@@ -16308,7 +16308,7 @@ SIM Card Slot</text>
 <wire x1="109.22" y1="78.74" x2="76.2" y2="78.74" width="0.1524" layer="91"/>
 <wire x1="76.2" y1="78.74" x2="71.12" y2="78.74" width="0.1524" layer="91"/>
 <label x="71.12" y="78.74" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="R10" gate="G$1" pin="2"/>
+<pinref part="R9" gate="G$1" pin="2"/>
 <junction x="76.2" y="78.74"/>
 </segment>
 <segment>
@@ -16332,7 +16332,7 @@ SIM Card Slot</text>
 <segment>
 <label x="175.26" y="228.6" size="1.27" layer="95" xref="yes"/>
 <wire x1="175.26" y1="228.6" x2="162.56" y2="228.6" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="4"/>
+<pinref part="X3" gate="A" pin="4"/>
 </segment>
 </net>
 <net name="!GPS_DISABLE" class="0">
@@ -16340,7 +16340,7 @@ SIM Card Slot</text>
 <pinref part="NGFF1" gate="G$1" pin="!GPS_DISABLE"/>
 <wire x1="109.22" y1="48.26" x2="78.74" y2="48.26" width="0.1524" layer="91"/>
 <wire x1="78.74" y1="48.26" x2="78.74" y2="33.02" width="0.1524" layer="91"/>
-<pinref part="R7" gate="G$1" pin="1"/>
+<pinref part="R6" gate="G$1" pin="1"/>
 <wire x1="78.74" y1="33.02" x2="73.66" y2="33.02" width="0.1524" layer="91"/>
 <wire x1="78.74" y1="33.02" x2="78.74" y2="30.48" width="0.1524" layer="91"/>
 <junction x="78.74" y="33.02"/>
@@ -16356,7 +16356,7 @@ SIM Card Slot</text>
 <net name="N$6" class="0">
 <segment>
 <pinref part="NGFF1" gate="G$1" pin="!LED"/>
-<pinref part="R3" gate="G$1" pin="2"/>
+<pinref part="R2" gate="G$1" pin="2"/>
 <wire x1="109.22" y1="55.88" x2="55.88" y2="55.88" width="0.1524" layer="91"/>
 </segment>
 </net>
@@ -16369,7 +16369,7 @@ SIM Card Slot</text>
 <segment>
 <label x="175.26" y="220.98" size="1.27" layer="95" xref="yes"/>
 <wire x1="175.26" y1="220.98" x2="162.56" y2="220.98" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="10"/>
+<pinref part="X3" gate="A" pin="10"/>
 </segment>
 </net>
 <net name="!WAKE_ON_WWAN" class="0">
@@ -16387,7 +16387,7 @@ SIM Card Slot</text>
 <segment>
 <label x="175.26" y="226.06" size="1.27" layer="95" xref="yes"/>
 <wire x1="175.26" y1="226.06" x2="162.56" y2="226.06" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="A" pin="6"/>
+<pinref part="X3" gate="A" pin="6"/>
 </segment>
 </net>
 <net name="VCC_1V8" class="0">
@@ -16401,7 +16401,7 @@ SIM Card Slot</text>
 <label x="281.94" y="203.2" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="R12" gate="G$1" pin="2"/>
+<pinref part="R10" gate="G$1" pin="2"/>
 <wire x1="93.98" y1="60.96" x2="91.44" y2="60.96" width="0.1524" layer="91"/>
 <label x="91.44" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
@@ -16411,24 +16411,24 @@ SIM Card Slot</text>
 <label x="58.42" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="R7" gate="G$1" pin="2"/>
+<pinref part="R6" gate="G$1" pin="2"/>
 <wire x1="63.5" y1="33.02" x2="60.96" y2="33.02" width="0.1524" layer="91"/>
 <label x="60.96" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="R8" gate="G$1" pin="2"/>
+<pinref part="R7" gate="G$1" pin="2"/>
 <wire x1="66.04" y1="25.4" x2="63.5" y2="25.4" width="0.1524" layer="91"/>
 <label x="63.5" y="25.4" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="58.42" y1="96.52" x2="60.96" y2="96.52" width="0.1524" layer="91"/>
 <label x="60.96" y="96.52" size="1.27" layer="95" xref="yes"/>
-<pinref part="R2" gate="G$1" pin="2"/>
+<pinref part="R3" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="208.28" x2="142.24" y2="208.28" width="0.1524" layer="91"/>
 <label x="142.24" y="208.28" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="JP1" gate="A" pin="19"/>
+<pinref part="X3" gate="A" pin="19"/>
 </segment>
 <segment>
 <pinref part="R4" gate="G$1" pin="2"/>
@@ -16436,7 +16436,7 @@ SIM Card Slot</text>
 <label x="55.88" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="R21" gate="G$1" pin="1"/>
+<pinref part="R20" gate="G$1" pin="1"/>
 <wire x1="218.44" y1="162.56" x2="218.44" y2="165.1" width="0.1524" layer="91"/>
 <label x="218.44" y="165.1" size="1.27" layer="95" rot="R90" xref="yes"/>
 </segment>
@@ -16448,7 +16448,7 @@ SIM Card Slot</text>
 </net>
 <net name="N$18" class="0">
 <segment>
-<pinref part="R2" gate="G$1" pin="1"/>
+<pinref part="R3" gate="G$1" pin="1"/>
 <wire x1="48.26" y1="96.52" x2="48.26" y2="88.9" width="0.1524" layer="91"/>
 <pinref part="X1" gate="G$1" pin="2"/>
 <wire x1="48.26" y1="88.9" x2="40.64" y2="88.9" width="0.1524" layer="91"/>
@@ -16461,7 +16461,7 @@ SIM Card Slot</text>
 <label x="220.98" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="R15" gate="G$1" pin="1"/>
+<pinref part="R14" gate="G$1" pin="1"/>
 <wire x1="162.56" y1="78.74" x2="165.1" y2="78.74" width="0.1524" layer="91"/>
 <pinref part="NGFF1" gate="G$1" pin="UIM_CLK"/>
 <label x="163.576" y="80.01" size="0.8128" layer="95"/>
@@ -16469,8 +16469,8 @@ SIM Card Slot</text>
 </net>
 <net name="N$3" class="3">
 <segment>
-<pinref part="X3" gate="G$1" pin="1"/>
-<pinref part="D3" gate="G$1" pin="A"/>
+<pinref part="X5" gate="G$1" pin="1"/>
+<pinref part="D2" gate="G$1" pin="A"/>
 <wire x1="231.14" y1="243.84" x2="236.22" y2="243.84" width="0.1524" layer="91"/>
 </segment>
 </net>
@@ -16495,7 +16495,7 @@ SIM Card Slot</text>
 <net name="N$11" class="3">
 <segment>
 <pinref part="SIM2" gate="-DETECT" pin="1@A"/>
-<pinref part="R21" gate="G$1" pin="2"/>
+<pinref part="R20" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="_USIM2_POWER" class="0">
@@ -16505,7 +16505,7 @@ SIM Card Slot</text>
 <label x="170.18" y="20.32" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="X9" gate="A" pin="1"/>
+<pinref part="X4" gate="A" pin="1"/>
 <wire x1="182.88" y1="106.68" x2="175.26" y2="106.68" width="0.1524" layer="91"/>
 <label x="175.26" y="106.68" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
@@ -16517,29 +16517,29 @@ SIM Card Slot</text>
 <label x="170.18" y="22.86" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="X9" gate="A" pin="3"/>
+<pinref part="X4" gate="A" pin="3"/>
 <wire x1="182.88" y1="104.14" x2="175.26" y2="104.14" width="0.1524" layer="91"/>
 <label x="175.26" y="104.14" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="N$15" class="0">
 <segment>
-<pinref part="R16" gate="G$1" pin="1"/>
-<pinref part="X9" gate="A" pin="6"/>
+<pinref part="R17" gate="G$1" pin="1"/>
+<pinref part="X4" gate="A" pin="6"/>
 <wire x1="198.12" y1="101.6" x2="190.5" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$16" class="0">
 <segment>
-<pinref part="X9" gate="A" pin="8"/>
-<pinref part="R20" gate="G$1" pin="1"/>
+<pinref part="X4" gate="A" pin="8"/>
+<pinref part="R18" gate="G$1" pin="1"/>
 <wire x1="190.5" y1="99.06" x2="198.12" y2="99.06" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$19" class="0">
 <segment>
 <pinref part="R19" gate="G$1" pin="1"/>
-<pinref part="X9" gate="A" pin="10"/>
+<pinref part="X4" gate="A" pin="10"/>
 <wire x1="198.12" y1="96.52" x2="190.5" y2="96.52" width="0.1524" layer="91"/>
 </segment>
 </net>
-- 
cgit v1.2.3