diff --git a/ngff-cardem/eagle/ngff-cardem.brd b/ngff-cardem/eagle/ngff-cardem.brd
index 1751d62..728bcdc 100644
--- a/ngff-cardem/eagle/ngff-cardem.brd
+++ b/ngff-cardem/eagle/ngff-cardem.brd
@@ -266,55 +266,6 @@
 <rectangle x1="2.286" y1="-0.254" x2="2.794" y2="0.254" layer="51"/>
 <rectangle x1="-0.254" y1="-0.254" x2="0.254" y2="0.254" layer="51"/>
 </package>
-<package name="2X04">
-<wire x1="-5.08" y1="-1.905" x2="-4.445" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="-3.175" y1="-2.54" x2="-2.54" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="-2.54" y1="-1.905" x2="-1.905" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="-0.635" y1="-2.54" x2="0" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="0" y1="-1.905" x2="0.635" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="1.905" y1="-2.54" x2="2.54" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="2.54" y1="-1.905" x2="3.175" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="4.445" y1="-2.54" x2="5.08" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="-5.08" y1="-1.905" x2="-5.08" y2="1.905" width="0.1524" layer="21"/>
-<wire x1="-5.08" y1="1.905" x2="-4.445" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="-4.445" y1="2.54" x2="-3.175" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="-3.175" y1="2.54" x2="-2.54" y2="1.905" width="0.1524" layer="21"/>
-<wire x1="-2.54" y1="1.905" x2="-1.905" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="-1.905" y1="2.54" x2="-0.635" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="-0.635" y1="2.54" x2="0" y2="1.905" width="0.1524" layer="21"/>
-<wire x1="0" y1="1.905" x2="0.635" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="0.635" y1="2.54" x2="1.905" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="1.905" y1="2.54" x2="2.54" y2="1.905" width="0.1524" layer="21"/>
-<wire x1="2.54" y1="1.905" x2="3.175" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="3.175" y1="2.54" x2="4.445" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="4.445" y1="2.54" x2="5.08" y2="1.905" width="0.1524" layer="21"/>
-<wire x1="-2.54" y1="1.905" x2="-2.54" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="0" y1="1.905" x2="0" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="2.54" y1="1.905" x2="2.54" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="5.08" y1="1.905" x2="5.08" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="3.175" y1="-2.54" x2="4.445" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="0.635" y1="-2.54" x2="1.905" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="-1.905" y1="-2.54" x2="-0.635" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="-4.445" y1="-2.54" x2="-3.175" y2="-2.54" width="0.1524" layer="21"/>
-<pad name="1" x="-3.81" y="-1.27" drill="1.016" shape="square"/>
-<pad name="2" x="-3.81" y="1.27" drill="1.016" shape="octagon"/>
-<pad name="3" x="-1.27" y="-1.27" drill="1.016" shape="octagon"/>
-<pad name="4" x="-1.27" y="1.27" drill="1.016" shape="octagon"/>
-<pad name="5" x="1.27" y="-1.27" drill="1.016" shape="octagon"/>
-<pad name="6" x="1.27" y="1.27" drill="1.016" shape="octagon"/>
-<pad name="7" x="3.81" y="-1.27" drill="1.016" shape="octagon"/>
-<pad name="8" x="3.81" y="1.27" drill="1.016" shape="octagon"/>
-<text x="-5.08" y="3.175" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="-5.08" y="-4.445" size="1.27" layer="27">&gt;VALUE</text>
-<rectangle x1="-4.064" y1="-1.524" x2="-3.556" y2="-1.016" layer="51"/>
-<rectangle x1="-4.064" y1="1.016" x2="-3.556" y2="1.524" layer="51"/>
-<rectangle x1="-1.524" y1="1.016" x2="-1.016" y2="1.524" layer="51"/>
-<rectangle x1="-1.524" y1="-1.524" x2="-1.016" y2="-1.016" layer="51"/>
-<rectangle x1="1.016" y1="1.016" x2="1.524" y2="1.524" layer="51"/>
-<rectangle x1="1.016" y1="-1.524" x2="1.524" y2="-1.016" layer="51"/>
-<rectangle x1="3.556" y1="1.016" x2="4.064" y2="1.524" layer="51"/>
-<rectangle x1="3.556" y1="-1.524" x2="4.064" 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"/>
@@ -4546,18 +4497,18 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="60.7375" y="30.90875" size="1" layer="25" font="vector" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="59.6902" y="34.17875" size="0.508" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="R107" library="rc-sysmocom" package="_0603" value="10k" x="78.58" y="66.0075" smashed="yes" rot="R180">
-<attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/10W 0603" x="78.58" y="66.0075" size="1.27" layer="27" ratio="16" rot="R180" display="off"/>
-<attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RMCF0603FT10K0/RMCF0603FT10K0CT-ND" x="78.58" y="66.0075" size="1.27" layer="27" ratio="16" rot="R180" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" value="YPE HTML PUBLIC " x="78.58" y="66.0075" size="1.27" layer="27" ratio="16" rot="R180" display="off"/>
-<attribute name="CLASS" value="RESISTOR" x="78.58" y="66.0075" size="1.27" layer="27" ratio="16" rot="R180" display="off"/>
-<attribute name="POPULATED" value="TRUE" x="78.58" y="66.0075" size="1.27" layer="27" ratio="16" rot="R180" display="off"/>
-<attribute name="SOURCE" value="DIGIKEY" x="78.58" y="66.0075" size="1.27" layer="27" ratio="16" rot="R180" display="off"/>
-<attribute name="ROHSCERTIFICATE" value="Bleifrei / RoHS3-konform" x="78.58" y="66.0075" size="1.27" layer="27" ratio="16" rot="R180" display="off"/>
-<attribute name="MANUFACTURER" value="Stackpole Electronics Inc" x="78.58" y="66.0075" size="1.27" layer="27" ratio="16" rot="R180" display="off"/>
-<attribute name="SOURCEPARTNUMBER" value="RMCF0603FT10K0CT-ND" x="78.58" y="66.0075" size="1.27" layer="27" ratio="16" rot="R180" display="off"/>
-<attribute name="NAME" x="76.9925" y="63.94375" size="1" layer="25" font="vector" ratio="16"/>
-<attribute name="VALUE" x="80.1675" y="67.4998" size="0.508" layer="27" font="vector" ratio="10" rot="R180"/>
+<element name="R107" library="rc-sysmocom" package="_0603" value="10k" x="57.1825" y="32.59125" smashed="yes" rot="R270">
+<attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/10W 0603" x="57.1825" y="32.59125" 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="57.1825" y="32.59125" size="1.27" layer="27" ratio="16" rot="R270" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" value="YPE HTML PUBLIC " x="57.1825" y="32.59125" size="1.27" layer="27" ratio="16" rot="R270" display="off"/>
+<attribute name="CLASS" value="RESISTOR" x="57.1825" y="32.59125" size="1.27" layer="27" ratio="16" rot="R270" display="off"/>
+<attribute name="POPULATED" value="TRUE" x="57.1825" y="32.59125" size="1.27" layer="27" ratio="16" rot="R270" display="off"/>
+<attribute name="SOURCE" value="DIGIKEY" x="57.1825" y="32.59125" size="1.27" layer="27" ratio="16" rot="R270" display="off"/>
+<attribute name="ROHSCERTIFICATE" value="Bleifrei / RoHS3-konform" x="57.1825" y="32.59125" size="1.27" layer="27" ratio="16" rot="R270" display="off"/>
+<attribute name="MANUFACTURER" value="Stackpole Electronics Inc" x="57.1825" y="32.59125" size="1.27" layer="27" ratio="16" rot="R270" display="off"/>
+<attribute name="SOURCEPARTNUMBER" value="RMCF0603FT10K0CT-ND" x="57.1825" y="32.59125" size="1.27" layer="27" ratio="16" rot="R270" display="off"/>
+<attribute name="NAME" x="59.24625" y="31.00375" size="1" layer="25" font="vector" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="55.6902" y="34.17875" size="0.508" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
 <element name="R106" library="rc-sysmocom" package="_0603" value="10k" x="78.5825" y="68.5475" smashed="yes" rot="R180">
 <attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/10W 0603" x="78.5825" y="68.5475" size="1.27" layer="27" ratio="16" rot="R180" display="off"/>
@@ -4611,19 +4562,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="83.025" y="34.765" size="1" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="88.1075" y="47.785" size="1.27" layer="27" ratio="12" rot="R180"/>
 </element>
-<element name="X101" library="laforge" package="2X04" value="PINHD-2X4" x="83.66" y="69.8175" smashed="yes" rot="R270">
-<attribute name="NAME" x="87.4725" y="74.58" size="1" layer="25" ratio="16" rot="SR270"/>
-<attribute name="VALUE" x="79.215" y="74.8975" size="1.27" layer="27" rot="R270"/>
-<attribute name="DESCRIPTION" value="CONN HEADER VERT 8POS 2.54MM" x="83.66" y="69.8175" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="MANUFACTURER" value="Adam Tech" x="83.66" y="69.8175" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" value="PH2-08-UA" x="83.66" y="69.8175" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SOURCE" value="DIGIKEY" x="83.66" y="69.8175" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="SOURCEPARTNUMBER" value="2057-PH2-08-UA-ND" x="83.66" y="69.8175" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="ROHSCERTIFICATE" value="RoHS3-konform" x="83.66" y="69.8175" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="POPULATED" value="TRUE" x="83.66" y="69.8175" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="CLASS" value="CONNECTOR" x="83.66" y="69.8175" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="LINK" value="https://www.digikey.de/product-detail/de/adam-tech/PH2-08-UA/2057-PH2-08-UA-ND" x="83.66" y="69.8175" size="1.778" layer="27" rot="R270" display="off"/>
-</element>
 <element name="U301" library="ldo" package="SC70-5" value="MIC5366-1.8YC5" x="81.50125" y="48.80125" smashed="yes">
 <attribute name="NAME" x="79.91375" y="47.21375" size="1" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="78.96125" y="45.94375" size="1.27" layer="27" ratio="14"/>
@@ -5082,6 +5020,17 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="POPULATED" value="TRUE" x="67.4675" y="47.64" size="1.016" layer="27" ratio="14" rot="R90" display="off"/>
 <attribute name="ROHSCERTIFICATE" value="UNKNOWN ROHS CERTIFICATE" x="67.4675" y="47.64" size="1.016" layer="27" ratio="14" rot="R90" display="off"/>
 </element>
+<element name="X2" library="SparkFun-Connectors" package="2X03" value="PINHD-2X3-SP" x="83.66125" y="71.12" rot="R270">
+<attribute name="SOURCEPARTNUMBER" value="WM17457-ND" x="83.66125" y="71.12" size="1.016" layer="27" ratio="14" rot="R270" display="off"/>
+<attribute name="DESCRIPTION" value="CONN HEADER SMD 6POS 2.54MM" x="83.66125" y="71.12" size="1.016" layer="27" ratio="14" rot="R270" display="off"/>
+<attribute name="CLASS" value="CONNECTOR" x="83.66125" y="71.12" size="1.016" layer="27" ratio="14" rot="R270" display="off"/>
+<attribute name="SOURCE" value="DIGIKEY" x="83.66125" y="71.12" size="1.016" layer="27" ratio="14" rot="R270" display="off"/>
+<attribute name="LINK" value="http://www.digikey.de/product-detail/de/molex-llc/0015910060/WM17457-ND/614773" x="83.66125" y="71.12" size="1.016" layer="27" ratio="14" rot="R270" display="off"/>
+<attribute name="MANUFACTURER" value="Molex" x="83.66125" y="71.12" size="1.016" layer="27" ratio="14" rot="R270" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" value="0015910060" x="83.66125" y="71.12" size="1.016" layer="27" ratio="14" rot="R270" display="off"/>
+<attribute name="POPULATED" value="TRUE" x="83.66125" y="71.12" size="1.016" layer="27" ratio="14" rot="R270" display="off"/>
+<attribute name="ROHSCERTIFICATE" value="UNKNOWN ROHS CERTIFICATE" x="83.66125" y="71.12" size="1.016" layer="27" ratio="14" rot="R270" display="off"/>
+</element>
 </elements>
 <signals>
 <signal name="GND" class="3">
@@ -5287,9 +5236,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="57.247" y1="38.4825" x2="57.43625" y2="38.61075" width="0.3048" layer="1"/>
 <contactref element="X102" pad="8"/>
 <contactref element="X102" pad="5"/>
-<contactref element="X101" pad="8"/>
-<contactref element="X101" pad="6"/>
-<contactref element="X101" pad="4"/>
 <contactref element="U301" pad="2"/>
 <contactref element="C307" pad="1"/>
 <contactref element="C310" pad="1"/>
@@ -5515,7 +5461,10 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="21.90875" y="86.83625" extent="1-16" drill="0.3"/>
 <via x="26.03625" y="86.83625" extent="1-16" drill="0.3"/>
 <contactref element="X1" pad="6"/>
-<wire x1="82.6825" y1="85.1975" x2="98.7425" y2="80.613" width="0" layer="19" extent="1-1"/>
+<contactref element="X2" pad="4"/>
+<contactref element="X2" pad="6"/>
+<wire x1="95.25" y1="78.962" x2="98.7425" y2="80.613" width="0" layer="19" extent="1-1"/>
+<wire x1="84.93125" y1="71.12" x2="95.09125" y2="78.2" width="0" layer="19" extent="1-1"/>
 <wire x1="77.75375" y1="40.39625" x2="75.2475" y2="40.64" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MDM_USIM_CLK">
@@ -5914,10 +5863,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="18.725" y1="59.0475" x2="18.7325" y2="59.055" width="0.3048" layer="1"/>
 <wire x1="27.66125" y1="45.182" x2="26.67" y2="43.55575" width="0.3048" layer="1"/>
 <wire x1="26.67" y1="43.55575" x2="26.67" y2="43.44" width="0.3048" layer="1"/>
-<via x="26.67" y="42.17" extent="1-16" drill="0.3"/>
-<via x="20.655" y="42.17" extent="1-16" drill="0.3"/>
-<wire x1="26.67" y1="42.17" x2="26.67" y2="43.44" width="0" layer="19" extent="1-1"/>
-<wire x1="20.655" y1="42.17" x2="23.06" y2="43.44" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="USIM_CLK">
 <contactref element="D101" pad="5"/>
@@ -6442,8 +6387,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="LED1" pad="A"/>
 <wire x1="14.6025" y1="30.795" x2="12.446" y2="28.6385" width="0.3048" layer="1"/>
 <wire x1="12.446" y1="26.55" x2="12.446" y2="28.6385" width="0.3048" layer="1"/>
+<wire x1="40.545" y1="38.9575" x2="40.64" y2="38.1" width="0.8128" layer="15"/>
 <wire x1="36.8075" y1="32.8075" x2="14.6025" y2="30.795" width="0" layer="19" extent="1-1"/>
-<wire x1="40.545" y1="38.9575" x2="40.64" y2="38.1" width="0" layer="19" extent="1-15"/>
 </signal>
 <signal name="!NGFF_RESET">
 <contactref element="NGFF101" pad="67"/>
@@ -6453,37 +6398,30 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="51.0435" y1="37.1775" x2="51.0435" y2="36.281" width="0.3048" layer="1"/>
 <wire x1="51.0435" y1="36.281" x2="50.07" y2="35.3075" width="0.3048" layer="1"/>
 <contactref element="R107" pad="1"/>
-<contactref element="X101" pad="7"/>
-<wire x1="82.39" y1="66.0075" x2="79.342" y2="66.0075" width="0.6096" layer="1"/>
 <wire x1="51.6575" y1="37.2125" x2="51.6575" y2="41.815" width="0.3048" layer="16"/>
-<wire x1="51.6575" y1="41.815" x2="54.61" y2="44.7675" width="0.3048" layer="16"/>
-<wire x1="54.61" y1="44.7675" x2="64.135" y2="44.7675" width="0.3048" layer="16"/>
-<wire x1="64.135" y1="44.7675" x2="68.2625" y2="48.895" width="0.3048" layer="16"/>
-<wire x1="68.2625" y1="48.895" x2="68.2625" y2="61.88" width="0.3048" layer="16"/>
-<via x="68.2625" y="61.88" extent="1-16" drill="0.3"/>
-<wire x1="68.2625" y1="61.88" x2="72.39" y2="66.0075" width="0.3048" layer="1"/>
-<wire x1="72.39" y1="66.0075" x2="75.8825" y2="66.0075" width="0.3048" layer="1"/>
-<via x="75.8825" y="66.0075" extent="1-16" drill="0.3"/>
-<wire x1="75.8825" y1="66.0075" x2="80.645" y2="66.0075" width="0.3048" layer="15"/>
-<wire x1="80.645" y1="66.0075" x2="82.39" y2="66.0075" width="0.6096" layer="15"/>
+<wire x1="57.1825" y1="33.35325" x2="57.16675" y2="33.3375" width="0.3048" layer="1"/>
+<wire x1="57.16675" y1="33.3375" x2="51.435" y2="33.3375" width="0.3048" layer="1"/>
+<wire x1="50.07" y1="35.3075" x2="50.07" y2="34.7025" width="0.3048" layer="1"/>
+<wire x1="50.07" y1="34.7025" x2="51.435" y2="33.3375" width="0.3048" layer="1"/>
 </signal>
 <signal name="!W_DISABLE">
 <contactref element="NGFF101" pad="8"/>
 <contactref element="R109" pad="1"/>
-<contactref element="X101" pad="3"/>
 <wire x1="65.0875" y1="62.8325" x2="73.025" y2="70.77" width="0.3048" layer="1"/>
 <wire x1="73.025" y1="70.77" x2="73.025" y2="71.0875" width="0.3048" layer="1"/>
-<wire x1="82.39" y1="71.0875" x2="79.088" y2="71.0875" width="0.4064" layer="1"/>
 <wire x1="79.088" y1="71.0875" x2="79.0575" y2="71.118" width="0.4064" layer="1"/>
 <via x="73.025" y="71.0875" extent="1-16" drill="0.3"/>
 <wire x1="73.025" y1="71.0875" x2="80.9625" y2="71.0875" width="0.3048" layer="15"/>
-<wire x1="80.9625" y1="71.0875" x2="82.39" y2="71.0875" width="0.6096" layer="15"/>
 <wire x1="65.7935" y1="44.7275" x2="65.7935" y2="46.284" width="0.3048" layer="1"/>
 <wire x1="65.7935" y1="46.284" x2="65.0875" y2="46.99" width="0.3048" layer="1"/>
 <via x="65.0875" y="46.99" extent="1-16" drill="0.3"/>
 <wire x1="65.0875" y1="46.99" x2="65.0875" y2="58.69" width="0.3048" layer="16"/>
 <via x="65.0875" y="58.69" extent="1-16" drill="0.3"/>
 <wire x1="65.0875" y1="58.69" x2="65.0875" y2="62.8325" width="0.3048" layer="1"/>
+<contactref element="X2" pad="3"/>
+<wire x1="80.9625" y1="71.0875" x2="82.35875" y2="71.0875" width="0.8128" layer="15"/>
+<wire x1="82.35875" y1="71.0875" x2="82.39125" y2="71.12" width="0.8128" layer="15"/>
+<wire x1="80.9625" y1="71.0875" x2="79.088" y2="71.0875" width="0" layer="19" extent="1-15"/>
 </signal>
 <signal name="_USIM1_DATA">
 <contactref element="R112" pad="1"/>
@@ -6752,23 +6690,24 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="PWR_ON">
 <contactref element="NGFF101" pad="6"/>
-<contactref element="X101" pad="1"/>
 <contactref element="R108" pad="2"/>
 <wire x1="66.04" y1="62.8325" x2="75.2475" y2="72.04" width="0.3048" layer="1"/>
-<wire x1="82.39" y1="73.6275" x2="80.9625" y2="73.6275" width="0.6096" layer="1"/>
 <wire x1="80.9625" y1="73.6275" x2="80.01" y2="74.58" width="0.4064" layer="1"/>
 <wire x1="80.01" y1="74.58" x2="79.0905" y2="74.58" width="0.4064" layer="1"/>
 <wire x1="79.0905" y1="74.58" x2="79.0575" y2="74.613" width="0.4064" layer="1"/>
 <wire x1="75.2475" y1="72.04" x2="75.2475" y2="73.6275" width="0.3048" layer="1"/>
 <via x="75.2475" y="73.6275" extent="1-16" drill="0.3"/>
 <wire x1="75.2475" y1="73.6275" x2="80.9625" y2="73.6275" width="0.3048" layer="15"/>
-<wire x1="80.9625" y1="73.6275" x2="82.39" y2="73.6275" width="0.6096" layer="15"/>
 <wire x1="66.2935" y1="44.7275" x2="66.2935" y2="47.689" width="0.3048" layer="1"/>
 <wire x1="66.2935" y1="47.689" x2="66.04" y2="47.9425" width="0.3048" layer="1"/>
 <via x="66.04" y="47.9425" extent="1-16" drill="0.3"/>
 <wire x1="66.04" y1="47.9425" x2="66.04" y2="57.7375" width="0.3048" layer="16"/>
 <via x="66.04" y="57.7375" extent="1-16" drill="0.3"/>
 <wire x1="66.04" y1="57.7375" x2="66.04" y2="62.8325" width="0.3048" layer="1"/>
+<contactref element="X2" pad="1"/>
+<wire x1="80.9625" y1="73.6275" x2="82.35875" y2="73.6275" width="0.8128" layer="1"/>
+<wire x1="82.35875" y1="73.6275" x2="82.39125" y2="73.66" width="0.8128" layer="1"/>
+<wire x1="80.9625" y1="73.6275" x2="82.39125" y2="73.66" width="0.8128" layer="15"/>
 </signal>
 <signal name="!BODY_SAR">
 <contactref element="NGFF101" pad="25"/>
@@ -6781,12 +6720,9 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <signal name="!GPS_DISABLE">
 <contactref element="NGFF101" pad="26"/>
 <contactref element="R106" pad="1"/>
-<contactref element="X101" pad="5"/>
 <wire x1="62.5475" y1="61.5625" x2="69.5325" y2="68.5475" width="0.3048" layer="1"/>
-<wire x1="82.39" y1="68.5475" x2="79.3445" y2="68.5475" width="0.6096" layer="1"/>
 <via x="69.5325" y="68.5475" extent="1-16" drill="0.3"/>
 <wire x1="69.5325" y1="68.5475" x2="80.9625" y2="68.5475" width="0.3048" layer="15"/>
-<wire x1="80.9625" y1="68.5475" x2="82.39" y2="68.5475" width="0.6096" layer="15"/>
 <wire x1="61.2935" y1="44.7275" x2="61.2935" y2="48.276" width="0.3048" layer="1"/>
 <wire x1="61.2935" y1="48.276" x2="62.5475" y2="49.53" width="0.3048" layer="1"/>
 <via x="62.5475" y="49.53" extent="1-16" drill="0.3"/>
@@ -6794,6 +6730,10 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="62.5475" y1="57.7525" x2="62.5475" y2="57.7375" width="0.3048" layer="16"/>
 <via x="62.5475" y="57.7375" extent="1-16" drill="0.3"/>
 <wire x1="62.5475" y1="57.7375" x2="62.5475" y2="61.5625" width="0.3048" layer="1"/>
+<contactref element="X2" pad="5"/>
+<wire x1="80.9625" y1="68.5475" x2="82.35875" y2="68.5475" width="0.8128" layer="15"/>
+<wire x1="82.35875" y1="68.5475" x2="82.39125" y2="68.58" width="0.8128" layer="15"/>
+<wire x1="80.9625" y1="68.5475" x2="79.3445" y2="68.5475" width="0" layer="19" extent="1-15"/>
 </signal>
 <signal name="N$20">
 <contactref element="NGFF101" pad="10"/>
@@ -6827,8 +6767,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="80.7705" y1="51.02125" x2="80.74125" y2="51.33875" width="0.6096" layer="1"/>
 <wire x1="80.645" y1="51.7525" x2="80.645" y2="51.33875" width="0.4064" layer="1"/>
 <wire x1="80.645" y1="51.33875" x2="80.74125" y2="51.33875" width="0.4064" layer="1"/>
-<wire x1="77.7875" y1="65.977" x2="77.818" y2="66.0075" width="0.6096" layer="1"/>
-<wire x1="77.818" y1="66.0075" x2="77.818" y2="67.349290625" width="0.4064" layer="1"/>
 <wire x1="77.818" y1="67.349290625" x2="77.818" y2="68.545" width="0.4064" layer="1"/>
 <wire x1="77.818" y1="68.545" x2="77.8205" y2="68.5475" width="0.6096" layer="1"/>
 <wire x1="77.8205" y1="68.5475" x2="77.8205" y2="68.832" width="0.6096" layer="1"/>
@@ -6841,7 +6779,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="62.77" y1="31.82925" x2="61.1825" y2="31.82925" width="0.3048" layer="1"/>
 <wire x1="61.1825" y1="31.82925" x2="59.53125" y2="31.82925" width="0.3048" layer="1"/>
 <wire x1="53.0225" y1="34.29" x2="55.245" y2="32.0675" width="0.3048" layer="16"/>
-<wire x1="59.53125" y1="31.82925" x2="55.48325" y2="31.82925" width="0.3048" layer="1"/>
+<wire x1="59.53125" y1="31.82925" x2="57.1825" y2="31.82925" width="0.3048" layer="1"/>
+<wire x1="57.15" y1="31.82925" x2="55.48325" y2="31.82925" width="0.3048" layer="1"/>
 <wire x1="55.48325" y1="31.82925" x2="55.245" y2="32.0675" width="0.3048" layer="1"/>
 <via x="55.245" y="32.0675" extent="1-16" drill="0.3"/>
 <wire x1="72.0725" y1="51.7525" x2="80.645" y2="51.7525" width="0.3048" layer="16"/>
@@ -6851,17 +6790,19 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="77.7875" y="67.2625" extent="1-16" drill="0.3"/>
 <wire x1="77.7875" y1="67.2625" x2="72.0725" y2="61.5475" width="0.4064" layer="16"/>
 <wire x1="72.0725" y1="61.5475" x2="72.0725" y2="51.7525" width="0.4064" layer="16"/>
+<wire x1="57.1825" y1="31.82925" x2="57.15" y2="31.82925" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$21">
 <contactref element="R103" pad="1"/>
-<contactref element="X101" pad="2"/>
-<wire x1="84.93" y1="73.6275" x2="84.93" y2="75.0575" width="0.6096" layer="1"/>
 <wire x1="79.36" y1="77.755" x2="77.7875" y2="77.755" width="0.4064" layer="1"/>
 <wire x1="77.7875" y1="77.755" x2="76.835" y2="76.8025" width="0.4064" layer="1"/>
 <wire x1="76.835" y1="76.8025" x2="76.835" y2="72.642" width="0.4064" layer="1"/>
 <wire x1="79.36" y1="77.755" x2="81.5975" y2="75.5175" width="0.4064" layer="1"/>
 <wire x1="81.5975" y1="75.5175" x2="84.47" y2="75.5175" width="0.4064" layer="1"/>
 <wire x1="84.47" y1="75.5175" x2="84.93" y2="75.0575" width="0.4064" layer="1"/>
+<contactref element="X2" pad="2"/>
+<wire x1="84.93" y1="75.0575" x2="84.93" y2="73.66125" width="0.8128" layer="1"/>
+<wire x1="84.93" y1="73.66125" x2="84.93125" y2="73.66" width="0.8128" layer="1"/>
 </signal>
 <signal name="_USIM1_CLK">
 <contactref element="R110" pad="1"/>
@@ -7095,7 +7036,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="19.62075" y1="62.92925" x2="19.3675" y2="63.1825" width="0.3048" layer="1"/>
 <via x="19.3675" y="63.1825" extent="1-16" drill="0.3"/>
 <wire x1="15.0975" y1="17.78" x2="20.6375" y2="17.78" width="0.3048" layer="1"/>
-<wire x1="95.40875" y1="80.89875" x2="98.7425" y2="79.597" width="0" layer="19" extent="1-1"/>
+<wire x1="95.25" y1="79.978" x2="98.7425" y2="79.597" width="0" layer="19" extent="1-1"/>
+<wire x1="36.0675" y1="80.4225" x2="95.25" y2="79.978" width="0" layer="19" extent="1-1"/>
 <wire x1="33.528" y1="72.0725" x2="33.3375" y2="69.215" width="0" layer="19" extent="1-1"/>
 <wire x1="12.47725" y1="20.5" x2="15.0975" y2="17.78" width="0" layer="19" extent="1-1"/>
 <wire x1="9.51075" y1="23.42" x2="12.47725" y2="20.5" width="0" layer="19" extent="1-1"/>
diff --git a/ngff-cardem/eagle/ngff-cardem.sch b/ngff-cardem/eagle/ngff-cardem.sch
index a63897f..61768e3 100644
--- a/ngff-cardem/eagle/ngff-cardem.sch
+++ b/ngff-cardem/eagle/ngff-cardem.sch
@@ -8,34 +8,34 @@
 </settings>
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="yes" active="no"/>
-<layer number="2" name="Route2" color="3" fill="3" visible="yes" active="no"/>
-<layer number="3" name="Route3" color="4" fill="3" visible="yes" active="no"/>
-<layer number="4" name="Route4" color="1" fill="4" visible="yes" active="no"/>
-<layer number="5" name="Route5" color="4" fill="4" visible="yes" active="no"/>
-<layer number="6" name="Route6" color="1" fill="8" visible="yes" active="no"/>
-<layer number="7" name="Route7" color="4" fill="8" visible="yes" active="no"/>
-<layer number="8" name="Route8" color="1" fill="2" visible="yes" active="no"/>
-<layer number="9" name="Route9" color="4" fill="2" visible="yes" active="no"/>
-<layer number="10" name="Route10" color="1" fill="7" visible="yes" active="no"/>
-<layer number="11" name="Route11" color="4" fill="7" visible="yes" active="no"/>
-<layer number="12" name="Route12" color="1" fill="5" visible="yes" active="no"/>
-<layer number="13" name="Route13" color="4" fill="5" visible="yes" active="no"/>
-<layer number="14" name="Route14" color="1" fill="6" visible="yes" active="no"/>
-<layer number="15" name="Route15" color="14" fill="6" visible="yes" active="no"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="no"/>
-<layer number="17" name="Pads" color="2" fill="1" visible="yes" active="no"/>
-<layer number="18" name="Vias" color="2" fill="1" visible="yes" active="no"/>
-<layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="no"/>
-<layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="no"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="no"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="no"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="no"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="no"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="no"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="no"/>
-<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="no"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="no"/>
+<layer number="1" name="Top" color="4" fill="1" visible="no" active="no"/>
+<layer number="2" name="Route2" color="3" fill="3" visible="no" active="no"/>
+<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"/>
+<layer number="6" name="Route6" color="1" fill="8" visible="no" active="no"/>
+<layer number="7" name="Route7" color="4" fill="8" visible="no" active="no"/>
+<layer number="8" name="Route8" color="1" fill="2" visible="no" active="no"/>
+<layer number="9" name="Route9" color="4" fill="2" visible="no" active="no"/>
+<layer number="10" name="Route10" color="1" fill="7" visible="no" active="no"/>
+<layer number="11" name="Route11" color="4" fill="7" visible="no" active="no"/>
+<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="no" active="no"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="no"/>
+<layer number="17" name="Pads" color="2" fill="1" visible="no" active="no"/>
+<layer number="18" name="Vias" color="2" fill="1" visible="no" active="no"/>
+<layer number="19" name="Unrouted" color="6" fill="1" visible="no" active="no"/>
+<layer number="20" name="Dimension" color="15" fill="1" visible="no" active="no"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="no"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="no"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="no"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="no"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="no"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="no" active="no"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="no" active="no"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="no" active="no"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="no"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="no"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="no"/>
@@ -44,8 +44,8 @@
 <layer number="34" name="bFinish" color="6" fill="6" visible="no" active="no"/>
 <layer number="35" name="tGlue" color="7" fill="4" visible="no" active="no"/>
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="no"/>
-<layer number="37" name="tTest" color="7" fill="1" visible="yes" active="no"/>
-<layer number="38" name="bTest" color="7" fill="1" visible="yes" active="no"/>
+<layer number="37" name="tTest" color="7" fill="1" visible="no" active="no"/>
+<layer number="38" name="bTest" color="7" fill="1" visible="no" active="no"/>
 <layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="no"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="no"/>
 <layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="no"/>
@@ -53,19 +53,19 @@
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="no"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="no"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="no" active="no"/>
-<layer number="46" name="Milling" color="3" fill="1" visible="yes" active="no"/>
-<layer number="47" name="Measures" color="7" fill="1" visible="yes" active="no"/>
-<layer number="48" name="Document" color="7" fill="1" visible="yes" active="no"/>
-<layer number="49" name="Reference" color="7" fill="1" visible="yes" active="no"/>
-<layer number="50" name="dxf" color="7" fill="1" visible="yes" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="no"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="no"/>
-<layer number="53" name="tGND_GNDA" color="7" fill="9" visible="yes" active="no"/>
-<layer number="54" name="bGND_GNDA" color="1" fill="9" visible="yes" active="no"/>
-<layer number="56" name="wert" color="7" fill="1" visible="yes" active="no"/>
-<layer number="57" name="tCAD" color="6" fill="1" visible="yes" active="no"/>
-<layer number="59" name="tMark" color="7" fill="1" visible="yes" active="no"/>
-<layer number="60" name="bMark" color="7" fill="1" visible="yes" active="no"/>
+<layer number="46" name="Milling" color="3" fill="1" visible="no" active="no"/>
+<layer number="47" name="Measures" color="7" fill="1" visible="no" active="no"/>
+<layer number="48" name="Document" color="7" fill="1" visible="no" active="no"/>
+<layer number="49" name="Reference" color="7" fill="1" visible="no" active="no"/>
+<layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="no"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="no"/>
+<layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
+<layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
+<layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
+<layer number="57" name="tCAD" color="6" fill="1" visible="no" active="no"/>
+<layer number="59" name="tMark" color="7" fill="1" visible="no" active="no"/>
+<layer number="60" name="bMark" color="7" fill="1" visible="no" active="no"/>
 <layer number="88" name="SimResults" color="9" fill="1" visible="yes" active="yes"/>
 <layer number="89" name="SimProbes" color="9" fill="1" visible="yes" active="yes"/>
 <layer number="90" name="Modules" color="5" fill="1" visible="yes" active="yes"/>
@@ -371,55 +371,6 @@ DIN A3, landscape with location and doc. field</description>
 <rectangle x1="2.286" y1="-0.254" x2="2.794" y2="0.254" layer="51"/>
 <rectangle x1="-0.254" y1="-0.254" x2="0.254" y2="0.254" layer="51"/>
 </package>
-<package name="2X04">
-<wire x1="-5.08" y1="-1.905" x2="-4.445" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="-3.175" y1="-2.54" x2="-2.54" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="-2.54" y1="-1.905" x2="-1.905" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="-0.635" y1="-2.54" x2="0" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="0" y1="-1.905" x2="0.635" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="1.905" y1="-2.54" x2="2.54" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="2.54" y1="-1.905" x2="3.175" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="4.445" y1="-2.54" x2="5.08" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="-5.08" y1="-1.905" x2="-5.08" y2="1.905" width="0.1524" layer="21"/>
-<wire x1="-5.08" y1="1.905" x2="-4.445" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="-4.445" y1="2.54" x2="-3.175" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="-3.175" y1="2.54" x2="-2.54" y2="1.905" width="0.1524" layer="21"/>
-<wire x1="-2.54" y1="1.905" x2="-1.905" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="-1.905" y1="2.54" x2="-0.635" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="-0.635" y1="2.54" x2="0" y2="1.905" width="0.1524" layer="21"/>
-<wire x1="0" y1="1.905" x2="0.635" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="0.635" y1="2.54" x2="1.905" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="1.905" y1="2.54" x2="2.54" y2="1.905" width="0.1524" layer="21"/>
-<wire x1="2.54" y1="1.905" x2="3.175" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="3.175" y1="2.54" x2="4.445" y2="2.54" width="0.1524" layer="21"/>
-<wire x1="4.445" y1="2.54" x2="5.08" y2="1.905" width="0.1524" layer="21"/>
-<wire x1="-2.54" y1="1.905" x2="-2.54" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="0" y1="1.905" x2="0" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="2.54" y1="1.905" x2="2.54" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="5.08" y1="1.905" x2="5.08" y2="-1.905" width="0.1524" layer="21"/>
-<wire x1="3.175" y1="-2.54" x2="4.445" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="0.635" y1="-2.54" x2="1.905" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="-1.905" y1="-2.54" x2="-0.635" y2="-2.54" width="0.1524" layer="21"/>
-<wire x1="-4.445" y1="-2.54" x2="-3.175" y2="-2.54" width="0.1524" layer="21"/>
-<pad name="1" x="-3.81" y="-1.27" drill="1.016" shape="square"/>
-<pad name="2" x="-3.81" y="1.27" drill="1.016" shape="octagon"/>
-<pad name="3" x="-1.27" y="-1.27" drill="1.016" shape="octagon"/>
-<pad name="4" x="-1.27" y="1.27" drill="1.016" shape="octagon"/>
-<pad name="5" x="1.27" y="-1.27" drill="1.016" shape="octagon"/>
-<pad name="6" x="1.27" y="1.27" drill="1.016" shape="octagon"/>
-<pad name="7" x="3.81" y="-1.27" drill="1.016" shape="octagon"/>
-<pad name="8" x="3.81" y="1.27" drill="1.016" shape="octagon"/>
-<text x="-5.08" y="3.175" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="-5.08" y="-4.445" size="1.27" layer="27">&gt;VALUE</text>
-<rectangle x1="-4.064" y1="-1.524" x2="-3.556" y2="-1.016" layer="51"/>
-<rectangle x1="-4.064" y1="1.016" x2="-3.556" y2="1.524" layer="51"/>
-<rectangle x1="-1.524" y1="1.016" x2="-1.016" y2="1.524" layer="51"/>
-<rectangle x1="-1.524" y1="-1.524" x2="-1.016" y2="-1.016" layer="51"/>
-<rectangle x1="1.016" y1="1.016" x2="1.524" y2="1.524" layer="51"/>
-<rectangle x1="1.016" y1="-1.524" x2="1.524" y2="-1.016" layer="51"/>
-<rectangle x1="3.556" y1="1.016" x2="4.064" y2="1.524" layer="51"/>
-<rectangle x1="3.556" y1="-1.524" x2="4.064" y2="-1.016" layer="51"/>
-</package>
 </packages>
 <symbols>
 <symbol name="TVS_5_BIDIR">
@@ -480,22 +431,6 @@ DIN A3, landscape with location and doc. field</description>
 <pin name="2" x="7.62" y="0" visible="pad" length="middle" direction="pas" swaplevel="1" rot="R180"/>
 <pin name="3" x="7.62" y="2.54" visible="pad" length="middle" direction="pas" swaplevel="1" rot="R180"/>
 </symbol>
-<symbol name="PINH2X4">
-<wire x1="-6.35" y1="-7.62" x2="8.89" y2="-7.62" width="0.4064" layer="94"/>
-<wire x1="8.89" y1="-7.62" x2="8.89" y2="5.08" width="0.4064" layer="94"/>
-<wire x1="8.89" y1="5.08" x2="-6.35" y2="5.08" width="0.4064" layer="94"/>
-<wire x1="-6.35" y1="5.08" x2="-6.35" y2="-7.62" width="0.4064" layer="94"/>
-<text x="-6.35" y="5.715" size="1.778" layer="95">&gt;NAME</text>
-<text x="-6.35" y="-10.16" size="1.778" layer="96">&gt;VALUE</text>
-<pin name="1" x="-2.54" y="2.54" visible="pad" length="short" direction="pas" function="dot"/>
-<pin name="2" x="5.08" y="2.54" visible="pad" length="short" direction="pas" function="dot" rot="R180"/>
-<pin name="3" x="-2.54" y="0" visible="pad" length="short" direction="pas" function="dot"/>
-<pin name="4" x="5.08" y="0" visible="pad" length="short" direction="pas" function="dot" rot="R180"/>
-<pin name="5" x="-2.54" y="-2.54" visible="pad" length="short" direction="pas" function="dot"/>
-<pin name="6" x="5.08" y="-2.54" visible="pad" length="short" direction="pas" function="dot" rot="R180"/>
-<pin name="7" x="-2.54" y="-5.08" visible="pad" length="short" direction="pas" function="dot"/>
-<pin name="8" x="5.08" y="-5.08" visible="pad" length="short" direction="pas" function="dot" rot="R180"/>
-</symbol>
 </symbols>
 <devicesets>
 <deviceset name="PESD5V0UBV" prefix="D">
@@ -593,28 +528,6 @@ Standard 3-pin 0.1" header</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="PINHD-2X4" prefix="JP">
-<gates>
-<gate name="G$1" symbol="PINH2X4" x="-30.48" y="-7.62"/>
-</gates>
-<devices>
-<device name="" package="2X04">
-<connects>
-<connect gate="G$1" pin="1" pad="1"/>
-<connect gate="G$1" pin="2" pad="2"/>
-<connect gate="G$1" pin="3" pad="3"/>
-<connect gate="G$1" pin="4" pad="4"/>
-<connect gate="G$1" pin="5" pad="5"/>
-<connect gate="G$1" pin="6" pad="6"/>
-<connect gate="G$1" pin="7" pad="7"/>
-<connect gate="G$1" pin="8" pad="8"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 </devicesets>
 </library>
 <library name="rcl">
@@ -20636,17 +20549,6 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <attribute name="SOURCE" value="DIGIKEY"/>
 <attribute name="SOURCEPARTNUMBER" value="H125269DKR-ND"/>
 </part>
-<part name="X101" library="laforge" deviceset="PINHD-2X4" device="">
-<attribute name="CLASS" value="CONNECTOR"/>
-<attribute name="DESCRIPTION" value="CONN HEADER VERT 8POS 2.54MM"/>
-<attribute name="LINK" value="https://www.digikey.de/product-detail/de/adam-tech/PH2-08-UA/2057-PH2-08-UA-ND"/>
-<attribute name="MANUFACTURER" value="Adam Tech"/>
-<attribute name="MANUFACTURERPARTNUMBER" value="PH2-08-UA"/>
-<attribute name="POPULATED" value="TRUE"/>
-<attribute name="ROHSCERTIFICATE" value="RoHS3-konform"/>
-<attribute name="SOURCE" value="DIGIKEY"/>
-<attribute name="SOURCEPARTNUMBER" value="2057-PH2-08-UA-ND"/>
-</part>
 <part name="GND42" library="supply1" deviceset="GND" device=""/>
 <part name="U301" library="ldo" deviceset="LDO_FIXED_EN" device="-MIC5365-YC5" value="MIC5366-1.8YC5">
 <attribute name="CLASS" value="IC"/>
@@ -21057,6 +20959,17 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <attribute name="SOURCEPARTNUMBER" value="WM17457-ND"/>
 </part>
 <part name="GND32" library="supply1" deviceset="GND" device=""/>
+<part name="X2" library="SparkFun-Connectors" deviceset="PINHD-2X3" device="" value="PINHD-2X3-SP">
+<attribute name="CLASS" value="CONNECTOR"/>
+<attribute name="DESCRIPTION" value="CONN HEADER SMD 6POS 2.54MM"/>
+<attribute name="LINK" value="http://www.digikey.de/product-detail/de/molex-llc/0015910060/WM17457-ND/614773"/>
+<attribute name="MANUFACTURER" value="Molex"/>
+<attribute name="MANUFACTURERPARTNUMBER" value="0015910060"/>
+<attribute name="POPULATED" value="TRUE"/>
+<attribute name="ROHSCERTIFICATE" value="UNKNOWN ROHS CERTIFICATE"/>
+<attribute name="SOURCE" value="DIGIKEY"/>
+<attribute name="SOURCEPARTNUMBER" value="WM17457-ND"/>
+</part>
 </parts>
 <sheets>
 <sheet>
@@ -21064,7 +20977,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="289.56" y="15.24" size="2.54" layer="97">ngff-cardem
 (C) 2021 sysmocom GmbH</text>
 <text x="411.48" y="109.22" size="3.81" layer="97" font="vector" ratio="12">I/O Header</text>
-<text x="109.22" y="132.08" size="3.81" layer="97" font="vector" ratio="12">NGFF Socket</text>
+<text x="129.54" y="147.32" size="3.81" layer="97" font="vector" ratio="12">NGFF Socket</text>
 <text x="312.42" y="55.88" size="3.81" layer="97" font="vector" ratio="12">Blocking Capacitors</text>
 <text x="271.78" y="182.88" size="3.81" layer="97" font="vector" ratio="12">USB3 conn + TVS array</text>
 <wire x1="340.36" y1="71.12" x2="383.54" y2="71.12" width="0.1524" layer="97" style="longdash"/>
@@ -21078,44 +20991,44 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <text x="111.76" y="231.14" size="3.81" layer="97" ratio="10">SIM Slot</text>
 </plain>
 <instances>
-<instance part="R112" gate="G$1" x="190.5" y="104.14" smashed="yes">
-<attribute name="DESCRIPTION" x="190.5" y="104.14" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURER" x="190.5" y="104.14" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="190.5" y="104.14" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCE" x="190.5" y="104.14" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="190.5" y="104.14" size="1.778" layer="96" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="190.5" y="104.14" size="1.778" layer="96" display="off"/>
-<attribute name="POPULATED" x="190.5" y="104.14" size="1.778" layer="96" display="off"/>
-<attribute name="CLASS" x="190.5" y="104.14" size="1.778" layer="96" display="off"/>
-<attribute name="LINK" x="190.5" y="104.14" size="1.778" layer="96" display="off"/>
-<attribute name="NAME" x="184.15" y="102.108" size="1.27" layer="95"/>
-<attribute name="VALUE" x="194.056" y="102.235" size="1.27" layer="96"/>
+<instance part="R112" gate="G$1" x="187.96" y="124.46" smashed="yes">
+<attribute name="DESCRIPTION" x="187.96" y="124.46" size="1.778" layer="96" display="off"/>
+<attribute name="MANUFACTURER" x="187.96" y="124.46" size="1.778" layer="96" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="187.96" y="124.46" size="1.778" layer="96" display="off"/>
+<attribute name="SOURCE" x="187.96" y="124.46" size="1.778" layer="96" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="187.96" y="124.46" size="1.778" layer="96" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="187.96" y="124.46" size="1.778" layer="96" display="off"/>
+<attribute name="POPULATED" x="187.96" y="124.46" size="1.778" layer="96" display="off"/>
+<attribute name="CLASS" x="187.96" y="124.46" size="1.778" layer="96" display="off"/>
+<attribute name="LINK" x="187.96" y="124.46" size="1.778" layer="96" display="off"/>
+<attribute name="NAME" x="181.61" y="122.428" size="1.27" layer="95"/>
+<attribute name="VALUE" x="191.516" y="122.555" size="1.27" layer="96"/>
 </instance>
-<instance part="R110" gate="G$1" x="182.88" y="106.68" smashed="yes">
-<attribute name="DESCRIPTION" x="182.88" y="106.68" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURER" x="182.88" y="106.68" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="182.88" y="106.68" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCE" x="182.88" y="106.68" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="182.88" y="106.68" size="1.778" layer="96" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="182.88" y="106.68" size="1.778" layer="96" display="off"/>
-<attribute name="POPULATED" x="182.88" y="106.68" size="1.778" layer="96" display="off"/>
-<attribute name="CLASS" x="182.88" y="106.68" size="1.778" layer="96" display="off"/>
-<attribute name="LINK" x="182.88" y="106.68" size="1.778" layer="96" display="off"/>
-<attribute name="NAME" x="189.23" y="106.68" size="1.27" layer="95"/>
-<attribute name="VALUE" x="194.818" y="106.807" size="1.27" layer="96"/>
+<instance part="R110" gate="G$1" x="180.34" y="127" smashed="yes">
+<attribute name="DESCRIPTION" x="180.34" y="127" size="1.778" layer="96" display="off"/>
+<attribute name="MANUFACTURER" x="180.34" y="127" size="1.778" layer="96" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="180.34" y="127" size="1.778" layer="96" display="off"/>
+<attribute name="SOURCE" x="180.34" y="127" size="1.778" layer="96" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="180.34" y="127" size="1.778" layer="96" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="180.34" y="127" size="1.778" layer="96" display="off"/>
+<attribute name="POPULATED" x="180.34" y="127" size="1.778" layer="96" display="off"/>
+<attribute name="CLASS" x="180.34" y="127" size="1.778" layer="96" display="off"/>
+<attribute name="LINK" x="180.34" y="127" size="1.778" layer="96" display="off"/>
+<attribute name="NAME" x="186.69" y="127" size="1.27" layer="95"/>
+<attribute name="VALUE" x="192.278" y="127.127" size="1.27" layer="96"/>
 </instance>
-<instance part="R111" gate="G$1" x="190.5" y="109.22" smashed="yes">
-<attribute name="NAME" x="186.436" y="112.268" size="1.27" layer="95"/>
-<attribute name="VALUE" x="192.786" y="112.395" size="1.27" layer="96"/>
-<attribute name="DESCRIPTION" x="190.5" y="109.22" size="1.778" layer="96" rot="R180" display="off"/>
-<attribute name="MANUFACTURER" x="190.5" y="109.22" size="1.778" layer="96" rot="R180" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="190.5" y="109.22" size="1.778" layer="96" rot="R180" display="off"/>
-<attribute name="SOURCE" x="190.5" y="109.22" size="1.778" layer="96" rot="R180" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="190.5" y="109.22" size="1.778" layer="96" rot="R180" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="190.5" y="109.22" size="1.778" layer="96" rot="R180" display="off"/>
-<attribute name="POPULATED" x="190.5" y="109.22" size="1.778" layer="96" rot="R180" display="off"/>
-<attribute name="CLASS" x="190.5" y="109.22" size="1.778" layer="96" rot="R180" display="off"/>
-<attribute name="LINK" x="190.5" y="109.22" size="1.778" layer="96" rot="R180" display="off"/>
+<instance part="R111" gate="G$1" x="187.96" y="129.54" smashed="yes">
+<attribute name="NAME" x="183.896" y="132.588" size="1.27" layer="95"/>
+<attribute name="VALUE" x="190.246" y="132.715" size="1.27" layer="96"/>
+<attribute name="DESCRIPTION" x="187.96" y="129.54" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="MANUFACTURER" x="187.96" y="129.54" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="187.96" y="129.54" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="SOURCE" x="187.96" y="129.54" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="187.96" y="129.54" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="187.96" y="129.54" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="POPULATED" x="187.96" y="129.54" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="CLASS" x="187.96" y="129.54" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="LINK" x="187.96" y="129.54" size="1.778" layer="96" rot="R180" display="off"/>
 </instance>
 <instance part="C112" gate="G$1" x="340.36" y="43.18" smashed="yes" rot="R270">
 <attribute name="NAME" x="339.09" y="36.576" size="1.27" layer="95" rot="R90"/>
@@ -21263,29 +21176,29 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <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="R102" gate="G$1" x="63.5" y="83.82">
-<attribute name="DESCRIPTION" x="63.5" y="83.82" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="MANUFACTURER" x="63.5" y="83.82" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="63.5" y="83.82" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="SOURCE" x="63.5" y="83.82" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="63.5" y="83.82" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="63.5" y="83.82" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="POPULATED" x="63.5" y="83.82" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="CLASS" x="63.5" y="83.82" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="LINK" x="63.5" y="83.82" size="1.778" layer="96" rot="R270" display="off"/>
+<instance part="R102" gate="G$1" x="60.96" y="104.14">
+<attribute name="DESCRIPTION" x="60.96" y="104.14" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="MANUFACTURER" x="60.96" y="104.14" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="60.96" y="104.14" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="SOURCE" x="60.96" y="104.14" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="60.96" y="104.14" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="60.96" y="104.14" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="POPULATED" x="60.96" y="104.14" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="CLASS" x="60.96" y="104.14" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="LINK" x="60.96" y="104.14" size="1.778" layer="96" rot="R270" display="off"/>
 </instance>
-<instance part="NGFF101" gate="G$1" x="149.86" y="81.28">
-<attribute name="DESCRIPTION" x="149.86" y="81.28" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURER" x="149.86" y="81.28" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="149.86" y="81.28" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCE" x="149.86" y="81.28" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="149.86" y="81.28" size="1.778" layer="96" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="149.86" y="81.28" size="1.778" layer="96" display="off"/>
-<attribute name="POPULATED" x="149.86" y="81.28" size="1.778" layer="96" display="off"/>
-<attribute name="CLASS" x="149.86" y="81.28" size="1.778" layer="96" display="off"/>
-<attribute name="LINK" x="149.86" y="81.28" size="1.778" layer="96" display="off"/>
+<instance part="NGFF101" gate="G$1" x="147.32" y="101.6">
+<attribute name="DESCRIPTION" x="147.32" y="101.6" size="1.778" layer="96" display="off"/>
+<attribute name="MANUFACTURER" x="147.32" y="101.6" size="1.778" layer="96" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="147.32" y="101.6" size="1.778" layer="96" display="off"/>
+<attribute name="SOURCE" x="147.32" y="101.6" size="1.778" layer="96" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="147.32" y="101.6" size="1.778" layer="96" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="147.32" y="101.6" size="1.778" layer="96" display="off"/>
+<attribute name="POPULATED" x="147.32" y="101.6" size="1.778" layer="96" display="off"/>
+<attribute name="CLASS" x="147.32" y="101.6" size="1.778" layer="96" display="off"/>
+<attribute name="LINK" x="147.32" y="101.6" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="GND26" gate="1" x="99.06" y="109.22" rot="R270"/>
+<instance part="GND26" gate="1" x="96.52" y="129.54" rot="R270"/>
 <instance part="FRAME2" gate="G$1" x="0" y="0"/>
 <instance part="D103" gate="G$1" x="314.96" y="165.1">
 <attribute name="DESCRIPTION" x="314.96" y="165.1" size="1.778" layer="96" display="off"/>
@@ -21302,57 +21215,57 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <instance part="GND29" gate="1" x="289.56" y="119.38" rot="MR90"/>
 <instance part="GND30" gate="1" x="292.1" y="134.62" rot="MR90"/>
 <instance part="M1" gate="G$1" x="355.6" y="88.9"/>
-<instance part="R105" gate="G$1" x="78.74" y="68.58" smashed="yes" rot="R180">
-<attribute name="NAME" x="75.184" y="70.358" size="1.27" layer="95" font="vector" rot="R180"/>
-<attribute name="VALUE" x="85.09" y="70.231" size="1.27" layer="96" font="vector" rot="R180"/>
-<attribute name="DESCRIPTION" x="78.74" y="68.58" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURER" x="78.74" y="68.58" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="78.74" y="68.58" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCE" x="78.74" y="68.58" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="78.74" y="68.58" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="78.74" y="68.58" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="POPULATED" x="78.74" y="68.58" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="CLASS" x="78.74" y="68.58" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="LINK" x="78.74" y="68.58" size="1.778" layer="96" rot="R90" display="off"/>
+<instance part="R105" gate="G$1" x="76.2" y="88.9" smashed="yes" rot="R180">
+<attribute name="NAME" x="72.644" y="90.678" size="1.27" layer="95" font="vector" rot="R180"/>
+<attribute name="VALUE" x="82.55" y="90.551" size="1.27" layer="96" font="vector" rot="R180"/>
+<attribute name="DESCRIPTION" x="76.2" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="MANUFACTURER" x="76.2" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="76.2" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="SOURCE" x="76.2" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="76.2" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="76.2" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="POPULATED" x="76.2" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="CLASS" x="76.2" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="LINK" x="76.2" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
 </instance>
-<instance part="R107" gate="G$1" x="83.82" y="53.34" smashed="yes" rot="R180">
-<attribute name="NAME" x="83.82" y="56.642" size="1.27" layer="95" font="vector" rot="R180"/>
-<attribute name="VALUE" x="88.9" y="56.515" size="1.27" layer="96" font="vector" rot="R180"/>
-<attribute name="DESCRIPTION" x="83.82" y="53.34" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURER" x="83.82" y="53.34" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="83.82" y="53.34" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCE" x="83.82" y="53.34" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="83.82" y="53.34" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="83.82" y="53.34" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="POPULATED" x="83.82" y="53.34" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="CLASS" x="83.82" y="53.34" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="LINK" x="83.82" y="53.34" size="1.778" layer="96" rot="R90" display="off"/>
+<instance part="R107" gate="G$1" x="81.28" y="73.66" smashed="yes" rot="R180">
+<attribute name="NAME" x="81.28" y="76.962" size="1.27" layer="95" font="vector" rot="R180"/>
+<attribute name="VALUE" x="86.36" y="76.835" size="1.27" layer="96" font="vector" rot="R180"/>
+<attribute name="DESCRIPTION" x="81.28" y="73.66" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="MANUFACTURER" x="81.28" y="73.66" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="81.28" y="73.66" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="SOURCE" x="81.28" y="73.66" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="81.28" y="73.66" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="81.28" y="73.66" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="POPULATED" x="81.28" y="73.66" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="CLASS" x="81.28" y="73.66" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="LINK" x="81.28" y="73.66" size="1.778" layer="96" rot="R90" display="off"/>
 </instance>
-<instance part="R106" gate="G$1" x="81.28" y="60.96" smashed="yes" rot="R180">
-<attribute name="NAME" x="81.28" y="64.262" size="1.27" layer="95" font="vector" rot="R180"/>
-<attribute name="VALUE" x="86.36" y="64.135" size="1.27" layer="96" font="vector" rot="R180"/>
-<attribute name="DESCRIPTION" x="81.28" y="60.96" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURER" x="81.28" y="60.96" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="81.28" y="60.96" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCE" x="81.28" y="60.96" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="81.28" y="60.96" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="81.28" y="60.96" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="POPULATED" x="81.28" y="60.96" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="CLASS" x="81.28" y="60.96" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="LINK" x="81.28" y="60.96" size="1.778" layer="96" rot="R90" display="off"/>
+<instance part="R106" gate="G$1" x="78.74" y="81.28" smashed="yes" rot="R180">
+<attribute name="NAME" x="78.74" y="84.582" size="1.27" layer="95" font="vector" rot="R180"/>
+<attribute name="VALUE" x="83.82" y="84.455" size="1.27" layer="96" font="vector" rot="R180"/>
+<attribute name="DESCRIPTION" x="78.74" y="81.28" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="MANUFACTURER" x="78.74" y="81.28" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="78.74" y="81.28" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="SOURCE" x="78.74" y="81.28" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="78.74" y="81.28" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="78.74" y="81.28" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="POPULATED" x="78.74" y="81.28" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="CLASS" x="78.74" y="81.28" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="LINK" x="78.74" y="81.28" size="1.778" layer="96" rot="R90" display="off"/>
 </instance>
-<instance part="R109" gate="G$1" x="111.76" y="88.9" smashed="yes" rot="R180">
-<attribute name="NAME" x="108.966" y="88.646" size="1.27" layer="95" font="vector" rot="R180"/>
-<attribute name="VALUE" x="120.65" y="89.027" size="1.27" layer="96" font="vector" rot="R180"/>
-<attribute name="DESCRIPTION" x="111.76" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURER" x="111.76" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="111.76" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCE" x="111.76" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="111.76" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="111.76" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="POPULATED" x="111.76" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="CLASS" x="111.76" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="LINK" x="111.76" y="88.9" size="1.778" layer="96" rot="R90" display="off"/>
+<instance part="R109" gate="G$1" x="109.22" y="109.22" smashed="yes" rot="R180">
+<attribute name="NAME" x="106.426" y="108.966" size="1.27" layer="95" font="vector" rot="R180"/>
+<attribute name="VALUE" x="118.11" y="109.347" size="1.27" layer="96" font="vector" rot="R180"/>
+<attribute name="DESCRIPTION" x="109.22" y="109.22" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="MANUFACTURER" x="109.22" y="109.22" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="109.22" y="109.22" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="SOURCE" x="109.22" y="109.22" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="109.22" y="109.22" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="109.22" y="109.22" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="POPULATED" x="109.22" y="109.22" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="CLASS" x="109.22" y="109.22" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="LINK" x="109.22" y="109.22" size="1.778" layer="96" rot="R90" display="off"/>
 </instance>
 <instance part="R113" gate="G$1" x="86.36" y="195.58" smashed="yes" rot="R90">
 <attribute name="NAME" x="84.582" y="194.056" size="1.27" layer="95" font="vector" rot="R90"/>
@@ -21380,43 +21293,32 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <attribute name="CLASS" x="314.96" y="129.54" size="1.27" layer="96" rot="MR180" display="off"/>
 <attribute name="LINK" x="314.96" y="129.54" size="1.27" layer="96" rot="MR180" display="off"/>
 </instance>
-<instance part="X101" gate="G$1" x="60.96" y="124.46">
-<attribute name="DESCRIPTION" x="60.96" y="124.46" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURER" x="60.96" y="124.46" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="60.96" y="124.46" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCE" x="60.96" y="124.46" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="60.96" y="124.46" size="1.778" layer="96" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="60.96" y="124.46" size="1.778" layer="96" display="off"/>
-<attribute name="POPULATED" x="60.96" y="124.46" size="1.778" layer="96" display="off"/>
-<attribute name="CLASS" x="60.96" y="124.46" size="1.778" layer="96" display="off"/>
-<attribute name="LINK" x="60.96" y="124.46" size="1.778" layer="96" display="off"/>
+<instance part="GND42" gate="1" x="119.38" y="35.56" rot="R90"/>
+<instance part="R103" gate="G$1" x="127" y="38.1" smashed="yes">
+<attribute name="NAME" x="122.936" y="39.878" size="1.27" layer="95" font="vector"/>
+<attribute name="VALUE" x="129.54" y="40.005" size="1.27" layer="96" font="vector"/>
+<attribute name="DESCRIPTION" x="127" y="38.1" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="MANUFACTURER" x="127" y="38.1" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="127" y="38.1" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="SOURCE" x="127" y="38.1" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="127" y="38.1" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="127" y="38.1" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="POPULATED" x="127" y="38.1" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="CLASS" x="127" y="38.1" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="LINK" x="127" y="38.1" size="1.778" layer="96" rot="R270" display="off"/>
 </instance>
-<instance part="GND42" gate="1" x="76.2" y="124.46" rot="R90"/>
-<instance part="R103" gate="G$1" x="78.74" y="134.62" smashed="yes">
-<attribute name="NAME" x="77.216" y="136.398" size="1.27" layer="95" font="vector"/>
-<attribute name="VALUE" x="76.2" y="131.445" size="1.27" layer="96" font="vector"/>
-<attribute name="DESCRIPTION" x="78.74" y="134.62" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="MANUFACTURER" x="78.74" y="134.62" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="78.74" y="134.62" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="SOURCE" x="78.74" y="134.62" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="78.74" y="134.62" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="78.74" y="134.62" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="POPULATED" x="78.74" y="134.62" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="CLASS" x="78.74" y="134.62" size="1.778" layer="96" rot="R270" display="off"/>
-<attribute name="LINK" x="78.74" y="134.62" size="1.778" layer="96" rot="R270" display="off"/>
-</instance>
-<instance part="R104" gate="G$1" x="78.74" y="76.2" smashed="yes" rot="R180">
-<attribute name="NAME" x="75.184" y="77.978" size="1.27" layer="95" font="vector" rot="R180"/>
-<attribute name="VALUE" x="85.09" y="77.851" size="1.27" layer="96" font="vector" rot="R180"/>
-<attribute name="DESCRIPTION" x="78.74" y="76.2" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURER" x="78.74" y="76.2" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="78.74" y="76.2" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCE" x="78.74" y="76.2" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="78.74" y="76.2" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="78.74" y="76.2" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="POPULATED" x="78.74" y="76.2" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="CLASS" x="78.74" y="76.2" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="LINK" x="78.74" y="76.2" size="1.778" layer="96" rot="R90" display="off"/>
+<instance part="R104" gate="G$1" x="76.2" y="96.52" smashed="yes" rot="R180">
+<attribute name="NAME" x="72.644" y="98.298" size="1.27" layer="95" font="vector" rot="R180"/>
+<attribute name="VALUE" x="82.55" y="98.171" size="1.27" layer="96" font="vector" rot="R180"/>
+<attribute name="DESCRIPTION" x="76.2" y="96.52" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="MANUFACTURER" x="76.2" y="96.52" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="76.2" y="96.52" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="SOURCE" x="76.2" y="96.52" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="76.2" y="96.52" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="76.2" y="96.52" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="POPULATED" x="76.2" y="96.52" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="CLASS" x="76.2" y="96.52" size="1.778" layer="96" rot="R90" display="off"/>
+<attribute name="LINK" x="76.2" y="96.52" size="1.778" layer="96" rot="R90" display="off"/>
 </instance>
 <instance part="JP101" 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"/>
@@ -21440,20 +21342,20 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <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="R108" gate="G$1" x="88.9" y="101.6" smashed="yes" rot="R90">
-<attribute name="NAME" x="86.614" y="101.6" size="1.27" layer="95" rot="R90"/>
-<attribute name="VALUE" x="92.075" y="99.06" size="1.27" layer="96" rot="R90"/>
-<attribute name="DESCRIPTION" x="88.9" y="101.6" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURER" x="88.9" y="101.6" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="88.9" y="101.6" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCE" x="88.9" y="101.6" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="88.9" y="101.6" size="1.778" layer="96" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="88.9" y="101.6" size="1.778" layer="96" display="off"/>
-<attribute name="POPULATED" x="88.9" y="101.6" size="1.778" layer="96" display="off"/>
-<attribute name="CLASS" x="88.9" y="101.6" size="1.778" layer="96" display="off"/>
-<attribute name="LINK" x="88.9" y="101.6" size="1.778" layer="96" display="off"/>
+<instance part="R108" gate="G$1" x="86.36" y="121.92" smashed="yes" rot="R90">
+<attribute name="NAME" x="84.074" y="121.92" size="1.27" layer="95" rot="R90"/>
+<attribute name="VALUE" x="89.535" y="119.38" size="1.27" layer="96" rot="R90"/>
+<attribute name="DESCRIPTION" x="86.36" y="121.92" size="1.778" layer="96" display="off"/>
+<attribute name="MANUFACTURER" x="86.36" y="121.92" size="1.778" layer="96" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="86.36" y="121.92" size="1.778" layer="96" display="off"/>
+<attribute name="SOURCE" x="86.36" y="121.92" size="1.778" layer="96" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="86.36" y="121.92" size="1.778" layer="96" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="86.36" y="121.92" size="1.778" layer="96" display="off"/>
+<attribute name="POPULATED" x="86.36" y="121.92" size="1.778" layer="96" display="off"/>
+<attribute name="CLASS" x="86.36" y="121.92" size="1.778" layer="96" display="off"/>
+<attribute name="LINK" x="86.36" y="121.92" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="GND57" gate="1" x="88.9" y="93.98"/>
+<instance part="GND57" gate="1" x="86.36" y="114.3"/>
 <instance part="R117" gate="G$1" x="193.04" y="203.2" smashed="yes" rot="R270">
 <attribute name="SOURCE" x="193.04" y="203.2" size="1.778" layer="96" rot="R180" display="off"/>
 <attribute name="LINK" x="193.04" y="203.2" size="1.778" layer="96" rot="R180" display="off"/>
@@ -21803,31 +21705,42 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <attribute name="CLASS" x="370.84" y="83.82" size="1.778" layer="96" display="off"/>
 <attribute name="LINK" x="370.84" y="83.82" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="LED1" gate="G$1" x="50.8" y="83.82" smashed="yes" rot="R90">
-<attribute name="NAME" x="48.26" y="90.932" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="58.166" y="87.757" size="1.778" layer="96" rot="R180"/>
-<attribute name="DESCRIPTION" x="50.8" y="83.82" size="1.27" layer="96" rot="R180" display="off"/>
-<attribute name="MANUFACTURER" x="50.8" y="83.82" size="1.27" layer="96" rot="R180" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="50.8" y="83.82" size="1.27" layer="96" rot="R180" display="off"/>
-<attribute name="SOURCE" x="50.8" y="83.82" size="1.27" layer="96" rot="R180" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="50.8" y="83.82" size="1.27" layer="96" rot="R180" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="50.8" y="83.82" size="1.27" layer="96" rot="R180" display="off"/>
-<attribute name="POPULATED" x="50.8" y="83.82" size="1.27" layer="96" rot="R180" display="off"/>
-<attribute name="CLASS" x="50.8" y="83.82" size="1.27" layer="96" rot="R180" display="off"/>
-<attribute name="LINK" x="50.8" y="83.82" size="1.27" layer="96" rot="R180" display="off"/>
+<instance part="LED1" gate="G$1" x="48.26" y="104.14" smashed="yes" rot="R90">
+<attribute name="NAME" x="45.72" y="111.252" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="55.626" y="108.077" size="1.778" layer="96" rot="R180"/>
+<attribute name="DESCRIPTION" x="48.26" y="104.14" size="1.27" layer="96" rot="R180" display="off"/>
+<attribute name="MANUFACTURER" x="48.26" y="104.14" size="1.27" layer="96" rot="R180" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="48.26" y="104.14" size="1.27" layer="96" rot="R180" display="off"/>
+<attribute name="SOURCE" x="48.26" y="104.14" size="1.27" layer="96" rot="R180" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="48.26" y="104.14" size="1.27" layer="96" rot="R180" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="48.26" y="104.14" size="1.27" layer="96" rot="R180" display="off"/>
+<attribute name="POPULATED" x="48.26" y="104.14" size="1.27" layer="96" rot="R180" display="off"/>
+<attribute name="CLASS" x="48.26" y="104.14" size="1.27" layer="96" rot="R180" display="off"/>
+<attribute name="LINK" x="48.26" y="104.14" size="1.27" layer="96" rot="R180" display="off"/>
 </instance>
-<instance part="X1" gate="A" x="426.72" y="66.04">
-<attribute name="DESCRIPTION" x="426.72" y="66.04" size="1.27" layer="96" display="off"/>
-<attribute name="MANUFACTURER" x="426.72" y="66.04" size="1.27" layer="96" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="426.72" y="66.04" size="1.27" layer="96" display="off"/>
-<attribute name="SOURCE" x="426.72" y="66.04" size="1.27" layer="96" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="426.72" y="66.04" size="1.27" layer="96" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="426.72" y="66.04" size="1.27" layer="96" display="off"/>
-<attribute name="POPULATED" x="426.72" y="66.04" size="1.27" layer="96" display="off"/>
-<attribute name="CLASS" x="426.72" y="66.04" size="1.27" layer="96" display="off"/>
-<attribute name="LINK" x="426.72" y="66.04" size="1.27" layer="96" display="off"/>
+<instance part="X1" gate="A" x="185.42" y="35.56">
+<attribute name="DESCRIPTION" x="185.42" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="MANUFACTURER" x="185.42" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="185.42" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="SOURCE" x="185.42" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="185.42" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="185.42" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="POPULATED" x="185.42" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="CLASS" x="185.42" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="LINK" x="185.42" y="35.56" size="1.27" layer="96" display="off"/>
+</instance>
+<instance part="GND32" gate="1" x="198.12" y="33.02" rot="MR270"/>
+<instance part="X2" gate="A" x="104.14" y="35.56">
+<attribute name="DESCRIPTION" x="104.14" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="MANUFACTURER" x="104.14" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="104.14" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="SOURCE" x="104.14" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="104.14" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="104.14" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="POPULATED" x="104.14" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="CLASS" x="104.14" y="35.56" size="1.27" layer="96" display="off"/>
+<attribute name="LINK" x="104.14" y="35.56" size="1.27" layer="96" display="off"/>
 </instance>
-<instance part="GND32" gate="1" x="439.42" y="63.5" rot="MR270"/>
 </instances>
 <busses>
 </busses>
@@ -21886,7 +21799,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 </segment>
 <segment>
 <pinref part="GND26" gate="1" pin="GND"/>
-<wire x1="101.6" y1="109.22" x2="121.92" y2="109.22" width="0.1524" layer="91"/>
+<wire x1="99.06" y1="129.54" x2="119.38" y2="129.54" width="0.1524" layer="91"/>
 <pinref part="NGFF101" gate="G$1" pin="GND"/>
 </segment>
 <segment>
@@ -21905,17 +21818,13 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <pinref part="X102" gate="G$1" pin="GND@0"/>
 </segment>
 <segment>
-<pinref part="X101" gate="G$1" pin="8"/>
-<wire x1="73.66" y1="124.46" x2="73.66" y2="121.92" width="0.1524" layer="91"/>
-<wire x1="73.66" y1="121.92" x2="73.66" y2="119.38" width="0.1524" layer="91"/>
-<wire x1="73.66" y1="119.38" x2="66.04" y2="119.38" width="0.1524" layer="91"/>
-<pinref part="X101" gate="G$1" pin="6"/>
-<wire x1="66.04" y1="121.92" x2="73.66" y2="121.92" width="0.1524" layer="91"/>
-<junction x="73.66" y="121.92"/>
-<pinref part="X101" gate="G$1" pin="4"/>
-<wire x1="66.04" y1="124.46" x2="73.66" y2="124.46" width="0.1524" layer="91"/>
-<junction x="73.66" y="124.46"/>
+<wire x1="116.84" y1="35.56" x2="116.84" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="109.22" y1="33.02" x2="116.84" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="109.22" y1="35.56" x2="116.84" y2="35.56" width="0.1524" layer="91"/>
+<junction x="116.84" y="35.56"/>
 <pinref part="GND42" gate="1" pin="GND"/>
+<pinref part="X2" gate="A" pin="4"/>
+<pinref part="X2" gate="A" pin="6"/>
 </segment>
 <segment>
 <pinref part="R108" gate="G$1" pin="1"/>
@@ -22012,7 +21921,7 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <segment>
 <pinref part="X1" gate="A" pin="6"/>
 <pinref part="GND32" gate="1" pin="GND"/>
-<wire x1="436.88" y1="63.5" x2="431.8" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="195.58" y1="33.02" x2="190.5" y2="33.02" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="USIM_CLK" class="0">
@@ -22075,69 +21984,64 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <junction x="353.06" y="50.8"/>
 </segment>
 <segment>
-<label x="45.72" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
+<label x="43.18" y="104.14" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LED1" gate="G$1" pin="A"/>
-<wire x1="45.72" y1="83.82" x2="48.26" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="43.18" y1="104.14" x2="45.72" y2="104.14" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="3.3V"/>
-<wire x1="121.92" y1="111.76" x2="114.3" y2="111.76" width="0.1524" layer="91"/>
-<label x="114.3" y="111.76" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="132.08" x2="111.76" y2="132.08" width="0.1524" layer="91"/>
+<label x="111.76" y="132.08" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="R109" gate="G$1" pin="2"/>
-<wire x1="106.68" y1="88.9" x2="104.14" y2="88.9" width="0.1524" layer="91"/>
-<label x="104.14" y="88.9" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="104.14" y1="109.22" x2="101.6" y2="109.22" width="0.1524" layer="91"/>
+<label x="101.6" y="109.22" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="!NGFF_RESET" class="0">
 <segment>
-<wire x1="121.92" y1="73.66" x2="93.98" y2="73.66" width="0.1524" layer="91"/>
-<wire x1="93.98" y1="73.66" x2="93.98" y2="53.34" width="0.1524" layer="91"/>
-<wire x1="93.98" y1="53.34" x2="93.98" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="119.38" y1="93.98" x2="91.44" y2="93.98" width="0.1524" layer="91"/>
+<wire x1="91.44" y1="93.98" x2="91.44" y2="73.66" width="0.1524" layer="91"/>
+<wire x1="91.44" y1="73.66" x2="91.44" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="NGFF101" gate="G$1" pin="!RESET"/>
 <pinref part="R107" gate="G$1" pin="1"/>
-<wire x1="93.98" y1="50.8" x2="76.2" y2="50.8" width="0.1524" layer="91"/>
-<label x="76.2" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
-<wire x1="88.9" y1="53.34" x2="93.98" y2="53.34" width="0.1524" layer="91"/>
-<junction x="93.98" y="53.34"/>
-</segment>
-<segment>
-<pinref part="X101" gate="G$1" pin="7"/>
-<wire x1="58.42" y1="119.38" x2="53.34" y2="119.38" width="0.1524" layer="91"/>
-<label x="53.34" y="119.38" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="91.44" y1="71.12" x2="73.66" y2="71.12" width="0.1524" layer="91"/>
+<label x="73.66" y="71.12" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="86.36" y1="73.66" x2="91.44" y2="73.66" width="0.1524" layer="91"/>
+<junction x="91.44" y="73.66"/>
 </segment>
 </net>
 <net name="!W_DISABLE" class="0">
 <segment>
-<wire x1="121.92" y1="86.36" x2="116.84" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="119.38" y1="106.68" x2="114.3" y2="106.68" width="0.1524" layer="91"/>
 <pinref part="NGFF101" gate="G$1" pin="!W_DISABLE"/>
 <pinref part="R109" gate="G$1" pin="1"/>
-<wire x1="116.84" y1="86.36" x2="104.14" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="116.84" y1="88.9" x2="116.84" y2="86.36" width="0.1524" layer="91"/>
-<junction x="116.84" y="86.36"/>
-<label x="104.14" y="86.36" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="114.3" y1="106.68" x2="101.6" y2="106.68" width="0.1524" layer="91"/>
+<wire x1="114.3" y1="109.22" x2="114.3" y2="106.68" width="0.1524" layer="91"/>
+<junction x="114.3" y="106.68"/>
+<label x="101.6" y="106.68" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="X101" gate="G$1" pin="3"/>
-<wire x1="58.42" y1="124.46" x2="53.34" y2="124.46" width="0.1524" layer="91"/>
-<label x="53.34" y="124.46" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="101.6" y1="35.56" x2="96.52" y2="35.56" width="0.1524" layer="91"/>
+<label x="96.52" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="X2" gate="A" pin="3"/>
 </segment>
 </net>
 <net name="_USIM1_DATA" class="0">
 <segment>
 <pinref part="R112" gate="G$1" pin="1"/>
-<wire x1="175.26" y1="104.14" x2="185.42" y2="104.14" width="0.1524" layer="91"/>
+<wire x1="172.72" y1="124.46" x2="182.88" y2="124.46" width="0.1524" layer="91"/>
 <pinref part="NGFF101" gate="G$1" pin="UIM_DATA"/>
-<label x="176.276" y="104.648" size="0.8128" layer="95"/>
+<label x="173.736" y="124.968" size="0.8128" layer="95"/>
 </segment>
 </net>
 <net name="_!USIM1_RESET" class="0">
 <segment>
 <pinref part="R111" gate="G$1" pin="1"/>
-<wire x1="175.26" y1="109.22" x2="185.42" y2="109.22" width="0.1524" layer="91"/>
+<wire x1="172.72" y1="129.54" x2="182.88" y2="129.54" width="0.1524" layer="91"/>
 <pinref part="NGFF101" gate="G$1" pin="!UIM_RESET"/>
-<label x="176.53" y="109.728" size="0.8128" layer="95"/>
+<label x="173.99" y="130.048" size="0.8128" layer="95"/>
 </segment>
 </net>
 <net name="N$10" class="0">
@@ -22153,15 +22057,15 @@ You are welcome to use this library for commercial purposes. For attribution, we
 </net>
 <net name="COEX1" class="0">
 <segment>
-<wire x1="121.92" y1="55.88" x2="114.3" y2="55.88" width="0.1524" layer="91"/>
-<label x="114.3" y="55.88" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="76.2" x2="111.76" y2="76.2" width="0.1524" layer="91"/>
+<label x="111.76" y="76.2" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="COEX1"/>
 </segment>
 </net>
 <net name="COEX2" class="0">
 <segment>
-<wire x1="121.92" y1="53.34" x2="114.3" y2="53.34" width="0.1524" layer="91"/>
-<label x="114.3" y="53.34" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="73.66" x2="111.76" y2="73.66" width="0.1524" layer="91"/>
+<label x="111.76" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="COEX2"/>
 </segment>
 </net>
@@ -22173,63 +22077,63 @@ You are welcome to use this library for commercial purposes. For attribution, we
 </net>
 <net name="PCM_CLK" class="0">
 <segment>
-<label x="408.94" y="68.58" size="1.27" layer="95" rot="R180" xref="yes"/>
+<label x="167.64" y="38.1" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="X1" gate="A" pin="1"/>
-<wire x1="408.94" y1="68.58" x2="424.18" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="167.64" y1="38.1" x2="182.88" y2="38.1" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<label x="114.3" y="68.58" size="1.27" layer="95" rot="R180" xref="yes"/>
+<label x="111.76" y="88.9" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="PCM_CLK/I2S_CLK"/>
-<wire x1="114.3" y1="68.58" x2="121.92" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="111.76" y1="88.9" x2="119.38" y2="88.9" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="PCM_DIN" class="0">
 <segment>
-<label x="408.94" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
+<label x="167.64" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="X1" gate="A" pin="3"/>
-<wire x1="408.94" y1="66.04" x2="424.18" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="167.64" y1="35.56" x2="182.88" y2="35.56" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<label x="114.3" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
+<label x="111.76" y="86.36" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="PCM_DIN/I2S_DIN"/>
-<wire x1="114.3" y1="66.04" x2="121.92" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="111.76" y1="86.36" x2="119.38" y2="86.36" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="PCM_DOUT" class="0">
 <segment>
-<label x="444.5" y="68.58" size="1.27" layer="95" xref="yes"/>
+<label x="203.2" y="38.1" size="1.27" layer="95" xref="yes"/>
 <pinref part="X1" gate="A" pin="2"/>
-<wire x1="444.5" y1="68.58" x2="431.8" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="203.2" y1="38.1" x2="190.5" y2="38.1" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<label x="114.3" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
+<label x="111.76" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="PCM_DOUT/I2S_DOUT"/>
-<wire x1="114.3" y1="63.5" x2="121.92" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="111.76" y1="83.82" x2="119.38" y2="83.82" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="PCM_SYNC" class="0">
 <segment>
-<label x="444.5" y="66.04" size="1.27" layer="95" xref="yes"/>
+<label x="203.2" y="35.56" size="1.27" layer="95" xref="yes"/>
 <pinref part="X1" gate="A" pin="4"/>
-<wire x1="444.5" y1="66.04" x2="431.8" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="203.2" y1="35.56" x2="190.5" y2="35.56" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<label x="114.3" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
+<label x="111.76" y="81.28" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="PCM_SYNC/I2S_WS"/>
-<wire x1="114.3" y1="60.96" x2="121.92" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="111.76" y1="81.28" x2="119.38" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="SMB_DATA" class="0">
 <segment>
-<wire x1="175.26" y1="76.2" x2="182.88" y2="76.2" width="0.1524" layer="91"/>
-<label x="182.88" y="76.2" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="96.52" x2="180.34" y2="96.52" width="0.1524" layer="91"/>
+<label x="180.34" y="96.52" size="1.27" layer="95" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="I2C_SDA_SIWI"/>
 </segment>
 </net>
 <net name="SMB_CLK" class="0">
 <segment>
-<wire x1="175.26" y1="78.74" x2="182.88" y2="78.74" width="0.1524" layer="91"/>
-<label x="182.88" y="78.74" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="99.06" x2="180.34" y2="99.06" width="0.1524" layer="91"/>
+<label x="180.34" y="99.06" size="1.27" layer="95" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="I2C_SCL_SIWI"/>
 </segment>
 </net>
@@ -22240,8 +22144,8 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <wire x1="330.2" y1="160.02" x2="322.58" y2="160.02" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<wire x1="121.92" y1="101.6" x2="111.76" y2="101.6" width="0.1524" layer="91"/>
-<label x="111.76" y="101.6" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="121.92" x2="109.22" y2="121.92" width="0.1524" layer="91"/>
+<label x="109.22" y="121.92" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="USB_D_N"/>
 </segment>
 <segment>
@@ -22257,8 +22161,8 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <wire x1="297.18" y1="160.02" x2="304.8" y2="160.02" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<wire x1="121.92" y1="104.14" x2="111.76" y2="104.14" width="0.1524" layer="91"/>
-<label x="111.76" y="104.14" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="124.46" x2="109.22" y2="124.46" width="0.1524" layer="91"/>
+<label x="109.22" y="124.46" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="USB_D_P"/>
 </segment>
 <segment>
@@ -22270,15 +22174,15 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <net name="N$7" class="0">
 <segment>
 <pinref part="R102" gate="G$1" pin="1"/>
-<wire x1="58.42" y1="83.82" x2="55.88" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="104.14" x2="53.34" y2="104.14" width="0.1524" layer="91"/>
 <pinref part="LED1" gate="G$1" pin="C"/>
 </segment>
 </net>
 <net name="USB3.0_TX_N" class="1">
 <segment>
-<label x="111.76" y="99.06" size="1.27" layer="95" rot="R180" xref="yes"/>
+<label x="109.22" y="119.38" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="USB3.0_TX_N"/>
-<wire x1="111.76" y1="99.06" x2="121.92" y2="99.06" width="0.1524" layer="91"/>
+<wire x1="109.22" y1="119.38" x2="119.38" y2="119.38" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <label x="297.18" y="170.18" size="1.27" layer="95" rot="R180" xref="yes"/>
@@ -22293,9 +22197,9 @@ You are welcome to use this library for commercial purposes. For attribution, we
 </net>
 <net name="USB3.0_TX_P" class="1">
 <segment>
-<label x="111.76" y="96.52" size="1.27" layer="95" rot="R180" xref="yes"/>
+<label x="109.22" y="116.84" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="NGFF101" gate="G$1" pin="USB3.0_TX_P"/>
-<wire x1="111.76" y1="96.52" x2="121.92" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="109.22" y1="116.84" x2="119.38" y2="116.84" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <wire x1="304.8" y1="175.26" x2="297.18" y2="175.26" width="0.1524" layer="91"/>
@@ -22311,8 +22215,8 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <net name="USB3.0_RX_N" class="1">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="USB3.0_RX_N"/>
-<wire x1="121.92" y1="93.98" x2="111.76" y2="93.98" width="0.1524" layer="91"/>
-<label x="111.76" y="93.98" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="114.3" x2="109.22" y2="114.3" width="0.1524" layer="91"/>
+<label x="109.22" y="114.3" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <label x="330.2" y="175.26" size="1.27" layer="95" xref="yes"/>
@@ -22328,8 +22232,8 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <net name="USB3.0_RX_P" class="1">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="USB3.0_RX_P"/>
-<wire x1="121.92" y1="91.44" x2="111.76" y2="91.44" width="0.1524" layer="91"/>
-<label x="111.76" y="91.44" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="111.76" x2="109.22" y2="111.76" width="0.1524" layer="91"/>
+<label x="109.22" y="111.76" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <label x="330.2" y="170.18" size="1.27" layer="95" xref="yes"/>
@@ -22351,8 +22255,8 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <net name="SIM_DET" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="SIM_DET"/>
-<wire x1="175.26" y1="111.76" x2="198.12" y2="111.76" width="0.1524" layer="91"/>
-<label x="198.12" y="111.76" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="132.08" x2="195.58" y2="132.08" width="0.1524" layer="91"/>
+<label x="195.58" y="132.08" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
 <wire x1="193.04" y1="185.42" x2="193.04" y2="182.88" width="0.1524" layer="91"/>
@@ -22366,150 +22270,150 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <net name="_USIM2_CLK" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="I2C_IRQ_HW/UIM2_CLK_SIWI"/>
-<wire x1="175.26" y1="55.88" x2="182.88" y2="55.88" width="0.1524" layer="91"/>
-<label x="182.88" y="55.88" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="76.2" x2="180.34" y2="76.2" width="0.1524" layer="91"/>
+<label x="180.34" y="76.2" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="_USIM2_DATA" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="I2C_SDA_HW/UIM2_DATA_SIWI"/>
-<wire x1="182.88" y1="53.34" x2="175.26" y2="53.34" width="0.1524" layer="91"/>
-<label x="182.88" y="53.34" size="1.27" layer="95" xref="yes"/>
+<wire x1="180.34" y1="73.66" x2="172.72" y2="73.66" width="0.1524" layer="91"/>
+<label x="180.34" y="73.66" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="_!USIM2_RESET" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="SYSCLK_HW/UIM2_RESET_SIWI"/>
-<wire x1="175.26" y1="45.72" x2="182.88" y2="45.72" width="0.1524" layer="91"/>
-<label x="182.88" y="45.72" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="66.04" x2="180.34" y2="66.04" width="0.1524" layer="91"/>
+<label x="180.34" y="66.04" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="ANTCTL0" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="ANTCTL0"/>
-<wire x1="175.26" y1="68.58" x2="182.88" y2="68.58" width="0.1524" layer="91"/>
-<label x="182.88" y="68.58" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="88.9" x2="180.34" y2="88.9" width="0.1524" layer="91"/>
+<label x="180.34" y="88.9" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="ANTCTL1" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="ANTCTL1"/>
-<wire x1="175.26" y1="66.04" x2="182.88" y2="66.04" width="0.1524" layer="91"/>
-<label x="182.88" y="66.04" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="86.36" x2="180.34" y2="86.36" width="0.1524" layer="91"/>
+<label x="180.34" y="86.36" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="ANTCTL2" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="ANTCTL2"/>
-<wire x1="175.26" y1="63.5" x2="182.88" y2="63.5" width="0.1524" layer="91"/>
-<label x="182.88" y="63.5" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="83.82" x2="180.34" y2="83.82" width="0.1524" layer="91"/>
+<label x="180.34" y="83.82" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="ANTCTL3" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="ANTCTL3"/>
-<wire x1="175.26" y1="60.96" x2="182.88" y2="60.96" width="0.1524" layer="91"/>
-<label x="182.88" y="60.96" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="81.28" x2="180.34" y2="81.28" width="0.1524" layer="91"/>
+<label x="180.34" y="81.28" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="COEX3" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="COEX3"/>
-<wire x1="121.92" y1="50.8" x2="114.3" y2="50.8" width="0.1524" layer="91"/>
-<label x="114.3" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="71.12" x2="111.76" y2="71.12" width="0.1524" layer="91"/>
+<label x="111.76" y="71.12" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="PWR_ON" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="PWR_ON_OFF"/>
-<wire x1="121.92" y1="106.68" x2="88.9" y2="106.68" width="0.1524" layer="91"/>
-<wire x1="88.9" y1="106.68" x2="83.82" y2="106.68" width="0.1524" layer="91"/>
-<label x="83.82" y="106.68" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="127" x2="86.36" y2="127" width="0.1524" layer="91"/>
+<wire x1="86.36" y1="127" x2="81.28" y2="127" width="0.1524" layer="91"/>
+<label x="81.28" y="127" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="R108" gate="G$1" pin="2"/>
-<junction x="88.9" y="106.68"/>
+<junction x="86.36" y="127"/>
 </segment>
 <segment>
-<pinref part="X101" gate="G$1" pin="1"/>
-<wire x1="58.42" y1="127" x2="53.34" y2="127" width="0.1524" layer="91"/>
-<label x="53.34" y="127" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="101.6" y1="38.1" x2="96.52" y2="38.1" width="0.1524" layer="91"/>
+<label x="96.52" y="38.1" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="X2" gate="A" pin="1"/>
 </segment>
 </net>
 <net name="!BODY_SAR" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="!BODY_SAR"/>
-<wire x1="121.92" y1="78.74" x2="88.9" y2="78.74" width="0.1524" layer="91"/>
-<wire x1="88.9" y1="78.74" x2="88.9" y2="68.58" width="0.1524" layer="91"/>
-<label x="71.12" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="99.06" x2="86.36" y2="99.06" width="0.1524" layer="91"/>
+<wire x1="86.36" y1="99.06" x2="86.36" y2="88.9" width="0.1524" layer="91"/>
+<label x="68.58" y="86.36" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="R105" gate="G$1" pin="1"/>
-<wire x1="88.9" y1="68.58" x2="88.9" y2="66.04" width="0.1524" layer="91"/>
-<wire x1="88.9" y1="66.04" x2="71.12" y2="66.04" width="0.1524" layer="91"/>
-<wire x1="83.82" y1="68.58" x2="88.9" y2="68.58" width="0.1524" layer="91"/>
-<junction x="88.9" y="68.58"/>
+<wire x1="86.36" y1="88.9" x2="86.36" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="86.36" y1="86.36" x2="68.58" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="81.28" y1="88.9" x2="86.36" y2="88.9" width="0.1524" layer="91"/>
+<junction x="86.36" y="88.9"/>
 </segment>
 </net>
 <net name="!GPS_DISABLE" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="!GPS_DISABLE"/>
-<wire x1="121.92" y1="76.2" x2="91.44" y2="76.2" width="0.1524" layer="91"/>
-<wire x1="91.44" y1="76.2" x2="91.44" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="119.38" y1="96.52" x2="88.9" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="88.9" y1="96.52" x2="88.9" y2="81.28" width="0.1524" layer="91"/>
 <pinref part="R106" gate="G$1" pin="1"/>
-<wire x1="91.44" y1="60.96" x2="86.36" y2="60.96" width="0.1524" layer="91"/>
-<wire x1="91.44" y1="60.96" x2="91.44" y2="58.42" width="0.1524" layer="91"/>
-<junction x="91.44" y="60.96"/>
-<wire x1="91.44" y1="58.42" x2="73.66" y2="58.42" width="0.1524" layer="91"/>
-<label x="73.66" y="58.42" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="88.9" y1="81.28" x2="83.82" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="88.9" y1="81.28" x2="88.9" y2="78.74" width="0.1524" layer="91"/>
+<junction x="88.9" y="81.28"/>
+<wire x1="88.9" 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"/>
 </segment>
 <segment>
-<pinref part="X101" gate="G$1" pin="5"/>
-<wire x1="58.42" y1="121.92" x2="53.34" y2="121.92" width="0.1524" layer="91"/>
-<label x="53.34" y="121.92" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="101.6" y1="33.02" x2="96.52" y2="33.02" width="0.1524" layer="91"/>
+<label x="96.52" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="X2" gate="A" pin="5"/>
 </segment>
 </net>
 <net name="N$20" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="!LED"/>
 <pinref part="R102" gate="G$1" pin="2"/>
-<wire x1="121.92" y1="83.82" x2="68.58" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="119.38" y1="104.14" x2="66.04" y2="104.14" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="!WAKE_ON_WWAN" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="!WAKE_ON_WWAN"/>
-<wire x1="121.92" y1="81.28" x2="86.36" y2="81.28" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="81.28" x2="86.36" y2="76.2" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="76.2" x2="86.36" y2="73.66" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="73.66" x2="68.58" y2="73.66" width="0.1524" layer="91"/>
-<label x="68.58" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="101.6" x2="83.82" y2="101.6" width="0.1524" layer="91"/>
+<wire x1="83.82" y1="101.6" x2="83.82" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="83.82" y1="96.52" x2="83.82" y2="93.98" width="0.1524" layer="91"/>
+<wire x1="83.82" y1="93.98" x2="66.04" y2="93.98" width="0.1524" layer="91"/>
+<label x="66.04" y="93.98" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="R104" gate="G$1" pin="1"/>
-<wire x1="83.82" y1="76.2" x2="86.36" y2="76.2" width="0.1524" layer="91"/>
-<junction x="86.36" y="76.2"/>
+<wire x1="81.28" y1="96.52" x2="83.82" y2="96.52" width="0.1524" layer="91"/>
+<junction x="83.82" y="96.52"/>
 </segment>
 </net>
 <net name="VCC_1V8" class="0">
 <segment>
 <pinref part="R105" gate="G$1" pin="2"/>
-<wire x1="73.66" y1="68.58" x2="71.12" y2="68.58" width="0.1524" layer="91"/>
-<label x="71.12" y="68.58" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="71.12" y1="88.9" x2="68.58" y2="88.9" width="0.1524" layer="91"/>
+<label x="68.58" y="88.9" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="R106" gate="G$1" pin="2"/>
-<wire x1="76.2" y1="60.96" x2="73.66" y2="60.96" width="0.1524" layer="91"/>
-<label x="73.66" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="73.66" y1="81.28" x2="71.12" y2="81.28" width="0.1524" layer="91"/>
+<label x="71.12" y="81.28" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="R107" gate="G$1" pin="2"/>
-<wire x1="78.74" y1="53.34" x2="76.2" y2="53.34" width="0.1524" layer="91"/>
-<label x="76.2" y="53.34" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="76.2" y1="73.66" x2="73.66" y2="73.66" width="0.1524" layer="91"/>
+<label x="73.66" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="83.82" y1="134.62" x2="86.36" y2="134.62" width="0.1524" layer="91"/>
-<label x="86.36" y="134.62" size="1.27" layer="95" xref="yes"/>
+<wire x1="132.08" y1="38.1" x2="134.62" y2="38.1" width="0.1524" layer="91"/>
+<label x="134.62" y="38.1" size="1.27" layer="95" xref="yes"/>
 <pinref part="R103" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <pinref part="R104" gate="G$1" pin="2"/>
-<wire x1="73.66" y1="76.2" x2="68.58" y2="76.2" width="0.1524" layer="91"/>
-<label x="68.58" y="76.2" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="71.12" y1="96.52" x2="66.04" y2="96.52" width="0.1524" layer="91"/>
+<label x="66.04" y="96.52" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="193.04" y1="208.28" x2="193.04" y2="210.82" width="0.1524" layer="91"/>
@@ -22520,57 +22424,56 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <net name="N$21" class="0">
 <segment>
 <pinref part="R103" gate="G$1" pin="1"/>
-<wire x1="73.66" y1="134.62" x2="73.66" y2="127" width="0.1524" layer="91"/>
-<pinref part="X101" gate="G$1" pin="2"/>
-<wire x1="73.66" y1="127" x2="66.04" y2="127" width="0.1524" layer="91"/>
+<wire x1="121.92" y1="38.1" x2="109.22" y2="38.1" width="0.1524" layer="91"/>
+<pinref part="X2" gate="A" pin="2"/>
 </segment>
 </net>
 <net name="_USIM1_CLK" class="0">
 <segment>
 <pinref part="R110" gate="G$1" pin="1"/>
-<wire x1="175.26" y1="106.68" x2="177.8" y2="106.68" width="0.1524" layer="91"/>
+<wire x1="172.72" y1="127" x2="175.26" y2="127" width="0.1524" layer="91"/>
 <pinref part="NGFF101" gate="G$1" pin="UIM_CLK"/>
-<label x="176.276" y="107.95" size="0.8128" layer="95"/>
+<label x="173.736" y="128.27" size="0.8128" layer="95"/>
 </segment>
 </net>
 <net name="_USIM2_POWER" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="TX_BLANKING_HW/UIM2_PWR_SIWI"/>
-<wire x1="175.26" y1="48.26" x2="182.88" y2="48.26" width="0.1524" layer="91"/>
-<label x="182.88" y="48.26" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="68.58" x2="180.34" y2="68.58" width="0.1524" layer="91"/>
+<label x="180.34" y="68.58" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="_SIM2_DET" class="0">
 <segment>
 <pinref part="NGFF101" gate="G$1" pin="I2C_SCL_HW/SIM_DET2_SIWI"/>
-<wire x1="175.26" y1="50.8" x2="182.88" y2="50.8" width="0.1524" layer="91"/>
-<label x="182.88" y="50.8" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="71.12" x2="180.34" y2="71.12" width="0.1524" layer="91"/>
+<label x="180.34" y="71.12" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="MDM_USIM_VDD" class="0">
 <segment>
-<label x="213.36" y="101.6" size="1.27" layer="95" font="vector" xref="yes"/>
-<wire x1="213.36" y1="101.6" x2="205.74" y2="101.6" width="0.1524" layer="91"/>
+<label x="210.82" y="121.92" size="1.27" layer="95" font="vector" xref="yes"/>
+<wire x1="210.82" y1="121.92" x2="203.2" y2="121.92" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="MDM_USIM_IO" class="0">
 <segment>
-<wire x1="195.58" 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" font="vector" xref="yes"/>
+<wire x1="193.04" y1="124.46" x2="195.58" y2="124.46" width="0.1524" layer="91"/>
+<label x="195.58" y="124.46" size="1.27" layer="95" font="vector" xref="yes"/>
 <pinref part="R112" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="MDM_USIM_CLK" class="0">
 <segment>
-<label x="198.12" y="106.68" size="1.27" layer="95" font="vector" xref="yes"/>
+<label x="195.58" y="127" size="1.27" layer="95" font="vector" xref="yes"/>
 <pinref part="R110" gate="G$1" pin="2"/>
-<wire x1="198.12" y1="106.68" x2="187.96" y2="106.68" width="0.1524" layer="91"/>
+<wire x1="195.58" y1="127" x2="185.42" y2="127" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="!MDM_USIM_RST" class="0">
 <segment>
-<wire x1="195.58" y1="109.22" x2="198.12" y2="109.22" width="0.1524" layer="91"/>
-<label x="198.12" y="109.22" size="1.27" layer="95" font="vector" xref="yes"/>
+<wire x1="193.04" y1="129.54" x2="195.58" y2="129.54" width="0.1524" layer="91"/>
+<label x="195.58" y="129.54" size="1.27" layer="95" font="vector" xref="yes"/>
 <pinref part="R111" gate="G$1" pin="2"/>
 </segment>
 </net>
@@ -22751,8 +22654,8 @@ You are welcome to use this library for commercial purposes. For attribution, we
 <net name="VCC" class="3">
 <segment>
 <pinref part="X1" gate="A" pin="5"/>
-<wire x1="424.18" y1="63.5" x2="419.1" y2="63.5" width="0.1524" layer="91"/>
-<label x="419.1" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="182.88" y1="33.02" x2="177.8" y2="33.02" width="0.1524" layer="91"/>
+<label x="177.8" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 </nets>