diff --git a/slave-daughter/slave-daughter-gieger2.sch b/slave-daughter/slave-daughter-gieger2.sch
--- a/slave-daughter/slave-daughter-gieger2.sch
+++ b/slave-daughter/slave-daughter-gieger2.sch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="6.3">
+<eagle version="6.4">
 <drawing>
 <settings>
 <setting alwaysvectorfont="no"/>
@@ -1033,53 +1033,6 @@ 5MM Through-hole LED&lt;br&gt;
 <vertex x="1.7119" y="-0.0101" curve="-90.012967"/>
 </polygon>
 </package>
-<package name="DPAK">
-<wire x1="3.2766" y1="2.4654" x2="3.277" y2="-3.729" width="0.2032" layer="21"/>
-<wire x1="3.277" y1="-3.729" x2="-3.277" y2="-3.729" width="0.2032" layer="21"/>
-<wire x1="-3.277" y1="-3.729" x2="-3.2766" y2="2.4654" width="0.2032" layer="21"/>
-<wire x1="-3.277" y1="2.465" x2="3.2774" y2="2.4646" width="0.2032" layer="51"/>
-<wire x1="-2.5654" y1="2.567" x2="-2.5654" y2="3.2782" width="0.2032" layer="51"/>
-<wire x1="-2.5654" y1="3.2782" x2="-2.1082" y2="3.7354" width="0.2032" layer="51"/>
-<wire x1="-2.1082" y1="3.7354" x2="2.1082" y2="3.7354" width="0.2032" layer="51"/>
-<wire x1="2.1082" y1="3.7354" x2="2.5654" y2="3.2782" width="0.2032" layer="51"/>
-<wire x1="2.5654" y1="3.2782" x2="2.5654" y2="2.567" width="0.2032" layer="51"/>
-<wire x1="2.5654" y1="2.567" x2="-2.5654" y2="2.567" width="0.2032" layer="51"/>
-<smd name="1" x="-2.28" y="-5.31" dx="1.6" dy="3" layer="1"/>
-<smd name="3" x="2.28" y="-5.31" dx="1.6" dy="3" layer="1"/>
-<smd name="4" x="0" y="1.588" dx="4.826" dy="5.715" layer="1"/>
-<text x="-3.683" y="-3.702" size="0.4064" layer="25" rot="R90">&gt;NAME</text>
-<text x="3.937" y="-3.702" size="0.4064" layer="27" rot="R90">&gt;VALUE</text>
-<rectangle x1="-2.7178" y1="-6.7262" x2="-1.8542" y2="-3.8306" layer="51"/>
-<rectangle x1="1.8542" y1="-6.7262" x2="2.7178" y2="-3.8306" layer="51"/>
-<rectangle x1="-0.4318" y1="-4.5926" x2="0.4318" y2="-3.8306" layer="21"/>
-<polygon width="0.1998" layer="51">
-<vertex x="-2.5654" y="2.567"/>
-<vertex x="-2.5654" y="3.2782"/>
-<vertex x="-2.1082" y="3.7354"/>
-<vertex x="2.1082" y="3.7354"/>
-<vertex x="2.5654" y="3.2782"/>
-<vertex x="2.5654" y="2.567"/>
-</polygon>
-</package>
-<package name="TO220V">
-<description>&lt;b&gt;TO 220 Vertical&lt;/b&gt; Package works with various parts including N-Channel MOSFET SparkFun SKU: COM-10213</description>
-<wire x1="-5.08" y1="2.032" x2="-5.08" y2="-0.381" width="0.2032" layer="21"/>
-<wire x1="5.08" y1="2.032" x2="5.08" y2="-0.381" width="0.2032" layer="21"/>
-<wire x1="5.08" y1="2.032" x2="-5.08" y2="2.032" width="0.2032" layer="21"/>
-<wire x1="-5.08" y1="2.032" x2="-5.08" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="-5.08" y1="3.048" x2="5.08" y2="3.048" width="0.2032" layer="21"/>
-<wire x1="5.08" y1="3.048" x2="5.08" y2="2.032" width="0.2032" layer="21"/>
-<wire x1="-5.08" y1="-0.381" x2="-4.191" y2="-1.27" width="0.2032" layer="21" curve="92.798868"/>
-<wire x1="5.08" y1="-0.381" x2="4.191" y2="-1.27" width="0.2032" layer="21" curve="-92.798868"/>
-<wire x1="-4.191" y1="-1.27" x2="-3.81" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="4.191" y1="-1.27" x2="3.81" y2="-1.27" width="0.2032" layer="21"/>
-<pad name="1" x="-2.54" y="0" drill="1.016" shape="long" rot="R90"/>
-<pad name="2" x="0" y="0" drill="1.016" shape="long" rot="R90"/>
-<pad name="3" x="2.54" y="0" drill="1.016" shape="long" rot="R90"/>
-<text x="-2.794" y="3.429" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="-3.302" y="-3.302" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
-<rectangle x1="-5.08" y1="2.032" x2="5.08" y2="3.048" layer="21"/>
-</package>
 <package name="SMA-DIODE">
 <description>&lt;B&gt;Diode&lt;/B&gt;&lt;p&gt;
 Basic SMA packaged diode. Good for reverse polarization protection. Common part #: MBRA140</description>
@@ -1971,53 +1924,6 @@ Standard schematic elements and footprin
 </device>
 </devices>
 </deviceset>
-<deviceset name="MOSFET-NCHANNEL" prefix="Q">
-<gates>
-<gate name="G$1" symbol="MOSFET-NCHANNEL" x="0" y="0"/>
-</gates>
-<devices>
-<device name="SMD" package="SOT23-3">
-<connects>
-<connect gate="G$1" pin="D" pad="3"/>
-<connect gate="G$1" pin="G" pad="1"/>
-<connect gate="G$1" pin="S" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="PTH" package="TO-92">
-<connects>
-<connect gate="G$1" pin="D" pad="1"/>
-<connect gate="G$1" pin="G" pad="3"/>
-<connect gate="G$1" pin="S" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="FDD8580" package="DPAK">
-<connects>
-<connect gate="G$1" pin="D" pad="4"/>
-<connect gate="G$1" pin="G" pad="1"/>
-<connect gate="G$1" pin="S" pad="3"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="PTH2" package="TO220V">
-<connects>
-<connect gate="G$1" pin="D" pad="2"/>
-<connect gate="G$1" pin="G" pad="1"/>
-<connect gate="G$1" pin="S" pad="3"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 <deviceset name="DIODE" prefix="D" uservalue="yes">
 <description>&lt;b&gt;Diode&lt;/b&gt;
 These are standard reverse protection diodes and small signal diodes. SMA package can handle up to about 1A. SOD-323 can handle about 200mA. What the SOD-323 package when ordering, there are some mfgs out there that are 5-pin packages.</description>
@@ -2108,6 +2014,23 @@ These are standard reverse protection di
 </device>
 </devices>
 </deviceset>
+<deviceset name="MOSFET-N-223">
+<gates>
+<gate name="G$1" symbol="MOSFET-NCHANNEL" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="SOT223">
+<connects>
+<connect gate="G$1" pin="D" pad="2 4"/>
+<connect gate="G$1" pin="G" pad="1"/>
+<connect gate="G$1" pin="S" pad="3"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 <library name="adafruit">
@@ -2504,18 +2427,12 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <text x="-3.81" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
 <smd name="21" x="0" y="0" dx="3.86" dy="2.74" layer="1"/>
 </package>
-<package name="TRANSFORMER_750032051">
-<smd name="1" x="-11.33" y="7.5" dx="2.92" dy="1.52" layer="1"/>
-<smd name="2" x="-11.33" y="3.75" dx="2.92" dy="1.52" layer="1"/>
-<smd name="3" x="-11.33" y="0" dx="2.92" dy="1.52" layer="1"/>
-<smd name="4" x="-11.33" y="-3.75" dx="2.92" dy="1.52" layer="1"/>
-<smd name="5" x="-11.33" y="-7.5" dx="2.92" dy="1.52" layer="1"/>
-<smd name="6" x="11.33" y="-7.5" dx="2.92" dy="1.52" layer="1"/>
-<smd name="7" x="11.33" y="-3.75" dx="2.92" dy="1.52" layer="1"/>
-<smd name="8" x="11.33" y="0" dx="2.92" dy="1.52" layer="1"/>
-<smd name="9" x="11.33" y="3.75" dx="2.92" dy="1.52" layer="1"/>
-<smd name="10" x="11.33" y="7.5" dx="2.92" dy="1.52" layer="1"/>
-<circle x="-6.5" y="6.5" radius="1" width="1.016" layer="21"/>
+<package name="PA0367">
+<smd name="P$1" x="0" y="4.98" dx="3" dy="3" layer="1" rot="R45"/>
+<smd name="P$2" x="-4.98" y="0" dx="3" dy="3" layer="1" rot="R45"/>
+<smd name="P$3" x="0" y="-4.98" dx="3" dy="3" layer="1" rot="R45"/>
+<smd name="P$4" x="4.98" y="0" dx="3" dy="3" layer="1" rot="R45"/>
+<circle x="0" y="3" radius="1" width="0.4064" layer="21"/>
 </package>
 </packages>
 <symbols>
@@ -2607,17 +2524,17 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </device>
 </devices>
 </deviceset>
-<deviceset name="TRANS_750032051X2">
+<deviceset name="PA0367">
 <gates>
 <gate name="G$1" symbol="TRANSFORMERX2" x="0" y="0"/>
 </gates>
 <devices>
-<device name="" package="TRANSFORMER_750032051">
+<device name="" package="PA0367">
 <connects>
-<connect gate="G$1" pin="P_2" pad="4 5"/>
-<connect gate="G$1" pin="P_DOT" pad="6 7"/>
-<connect gate="G$1" pin="S_2" pad="10"/>
-<connect gate="G$1" pin="S_DOT" pad="1"/>
+<connect gate="G$1" pin="P_2" pad="P$3"/>
+<connect gate="G$1" pin="P_DOT" pad="P$2"/>
+<connect gate="G$1" pin="S_2" pad="P$1"/>
+<connect gate="G$1" pin="S_DOT" pad="P$4"/>
 </connects>
 <technologies>
 <technology name=""/>
@@ -2644,7 +2561,6 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <part name="R1" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="1M"/>
 <part name="R2" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10M"/>
 <part name="GND4" library="SparkFun" deviceset="GND" device=""/>
-<part name="C2" library="SparkFun" deviceset="CAP" device="0603-CAP" value="47pF"/>
 <part name="GND5" library="SparkFun" deviceset="GND" device=""/>
 <part name="R5" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="1K"/>
 <part name="R6" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="1.8K"/>
@@ -2662,21 +2578,16 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <part name="P+7" library="SparkFun" deviceset="VCC" device=""/>
 <part name="GND10" library="SparkFun" deviceset="GND" device=""/>
 <part name="U$2" library="SeniorDesign" deviceset="LT3751" device=""/>
-<part name="R11" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="715k"/>
-<part name="R12" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="1.74k"/>
 <part name="R13" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="6mili"/>
 <part name="R15" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="11k"/>
 <part name="R16" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="30k"/>
 <part name="C1" library="SparkFun" deviceset="CAP" device="0603-CAP" value="10nF"/>
-<part name="C3" library="SparkFun" deviceset="CAP" device="0603-CAP" value=".47uF"/>
 <part name="GND2" library="SparkFun" deviceset="GND" device=""/>
 <part name="GND3" library="SparkFun" deviceset="GND" device=""/>
-<part name="U$4" library="SeniorDesign" deviceset="TRANS_750032051X2" device=""/>
 <part name="C4" library="SparkFun" deviceset="CAP" device="0603-CAP" value="2.2uF"/>
 <part name="GND6" library="SparkFun" deviceset="GND" device=""/>
 <part name="JP3" library="SparkFun" deviceset="M10" device="2MM"/>
 <part name="JP4" library="SparkFun" deviceset="M10" device="2MM"/>
-<part name="Q1" library="SparkFun" deviceset="MOSFET-NCHANNEL" device="SMD"/>
 <part name="GND9" library="SparkFun" deviceset="GND" device=""/>
 <part name="GND11" library="SparkFun" deviceset="GND" device=""/>
 <part name="D1" library="SparkFun" deviceset="DIODE" device="SMA"/>
@@ -2685,6 +2596,12 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <part name="R3" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="470"/>
 <part name="GND13" library="SparkFun" deviceset="GND" device=""/>
 <part name="GND14" library="SparkFun" deviceset="GND" device=""/>
+<part name="U$10" library="SeniorDesign" deviceset="PA0367" device=""/>
+<part name="U$4" library="SparkFun" deviceset="MOSFET-N-223" device=""/>
+<part name="C7" library="SparkFun" deviceset="CAP" device="0805" value=".47uF"/>
+<part name="R4" library="SparkFun" deviceset="RESISTOR" device="0805-RES" value="1.43M"/>
+<part name="R8" library="SparkFun" deviceset="RESISTOR" device="0805-RES" value="3.48k"/>
+<part name="C3" library="SparkFun" deviceset="CAP" device="0805" value="47pF"/>
 </parts>
 <sheets>
 <sheet>
@@ -2702,10 +2619,10 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <wire x1="195.58" y1="101.6" x2="195.58" y2="149.86" width="0.4064" layer="94"/>
 <wire x1="195.58" y1="149.86" x2="248.92" y2="149.86" width="0.4064" layer="94"/>
 <text x="203.2" y="139.7" size="6.4516" layer="94">EEPROM</text>
-<text x="86.36" y="78.74" size="3.81" layer="91">750032051</text>
 <text x="33.02" y="116.84" size="1.778" layer="91">CHARGE</text>
 <text x="83.82" y="50.8" size="1.778" layer="91">Use Logic Level Fet</text>
 <text x="111.76" y="86.36" size="1.778" layer="91">Add electrolytics to both sides of inductor as per datasheet</text>
+<text x="83.82" y="48.26" size="1.778" layer="91">NDT3055L</text>
 </plain>
 <instances>
 <instance part="FRAME1" gate="G$1" x="0" y="0"/>
@@ -2716,7 +2633,6 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <instance part="R1" gate="G$1" x="86.36" y="160.02"/>
 <instance part="R2" gate="G$1" x="106.68" y="160.02"/>
 <instance part="GND4" gate="1" x="106.68" y="170.18" rot="R180"/>
-<instance part="C2" gate="G$1" x="96.52" y="152.4"/>
 <instance part="GND5" gate="1" x="43.18" y="12.7"/>
 <instance part="R5" gate="G$1" x="96.52" y="129.54" rot="R90"/>
 <instance part="R6" gate="G$1" x="119.38" y="137.16" rot="R90"/>
@@ -2734,8 +2650,6 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <instance part="P+7" gate="1" x="236.22" y="132.08"/>
 <instance part="GND10" gate="1" x="236.22" y="109.22"/>
 <instance part="U$2" gate="G$1" x="45.72" y="50.8"/>
-<instance part="R11" gate="G$1" x="119.38" y="40.64" rot="R270"/>
-<instance part="R12" gate="G$1" x="119.38" y="25.4" rot="R270"/>
 <instance part="R13" gate="G$1" x="78.74" y="43.18" rot="R270"/>
 <instance part="R15" gate="G$1" x="71.12" y="63.5" smashed="yes">
 <attribute name="NAME" x="69.85" y="64.9986" size="1.778" layer="95"/>
@@ -2743,15 +2657,12 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </instance>
 <instance part="R16" gate="G$1" x="48.26" y="86.36" rot="R270"/>
 <instance part="C1" gate="G$1" x="71.12" y="25.4"/>
-<instance part="C3" gate="G$1" x="111.76" y="66.04"/>
 <instance part="GND2" gate="1" x="71.12" y="15.24"/>
 <instance part="GND3" gate="1" x="119.38" y="15.24"/>
-<instance part="U$4" gate="G$1" x="86.36" y="71.12"/>
 <instance part="C4" gate="G$1" x="60.96" y="86.36"/>
 <instance part="GND6" gate="1" x="60.96" y="78.74"/>
 <instance part="JP3" gate="G$1" x="10.16" y="127"/>
 <instance part="JP4" gate="G$1" x="10.16" y="162.56"/>
-<instance part="Q1" gate="G$1" x="78.74" y="53.34"/>
 <instance part="GND9" gate="1" x="83.82" y="35.56"/>
 <instance part="GND11" gate="1" x="93.98" y="58.42"/>
 <instance part="D1" gate="G$1" x="96.52" y="73.66"/>
@@ -2760,6 +2671,12 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <instance part="R3" gate="G$1" x="71.12" y="76.2" rot="R270"/>
 <instance part="GND13" gate="1" x="68.58" y="55.88"/>
 <instance part="GND14" gate="1" x="111.76" y="58.42"/>
+<instance part="U$10" gate="G$1" x="86.36" y="71.12"/>
+<instance part="U$4" gate="G$1" x="78.74" y="53.34"/>
+<instance part="C7" gate="G$1" x="111.76" y="66.04"/>
+<instance part="R4" gate="G$1" x="119.38" y="40.64" rot="R270"/>
+<instance part="R8" gate="G$1" x="119.38" y="25.4" rot="R270"/>
+<instance part="C3" gate="G$1" x="96.52" y="152.4"/>
 </instances>
 <busses>
 </busses>
@@ -2801,8 +2718,8 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </segment>
 <segment>
 <pinref part="GND3" gate="1" pin="GND"/>
-<pinref part="R12" gate="G$1" pin="2"/>
 <wire x1="119.38" y1="17.78" x2="119.38" y2="20.32" width="0.1524" layer="91"/>
+<pinref part="R8" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <pinref part="C4" gate="G$1" pin="2"/>
@@ -2820,8 +2737,8 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <segment>
 <pinref part="GND11" gate="1" pin="GND"/>
 <wire x1="93.98" y1="60.96" x2="93.98" y2="65.278" width="0.1524" layer="91"/>
-<pinref part="U$4" gate="G$1" pin="S_2"/>
 <wire x1="93.98" y1="65.278" x2="90.424" y2="65.278" width="0.1524" layer="91"/>
+<pinref part="U$10" gate="G$1" pin="S_2"/>
 </segment>
 <segment>
 <pinref part="U$2" gate="G$1" pin="GND"/>
@@ -2851,8 +2768,8 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </segment>
 <segment>
 <pinref part="GND14" gate="1" pin="GND"/>
-<pinref part="C3" gate="G$1" pin="2"/>
 <wire x1="111.76" y1="60.96" x2="111.76" y2="63.5" width="0.1524" layer="91"/>
+<pinref part="C7" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="VBAT" class="0">
@@ -2884,7 +2801,6 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <wire x1="60.96" y1="93.98" x2="71.12" y2="93.98" width="0.1524" layer="91"/>
 <wire x1="71.12" y1="93.98" x2="78.74" y2="93.98" width="0.1524" layer="91"/>
 <wire x1="78.74" y1="93.98" x2="78.74" y2="73.66" width="0.1524" layer="91"/>
-<pinref part="U$4" gate="G$1" pin="P_2"/>
 <wire x1="78.74" y1="73.66" x2="82.296" y2="73.66" width="0.1524" layer="91"/>
 <junction x="60.96" y="93.98"/>
 <pinref part="C4" gate="G$1" pin="1"/>
@@ -2896,6 +2812,7 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <pinref part="C5" gate="G$1" pin="1"/>
 <wire x1="71.12" y1="91.44" x2="71.12" y2="93.98" width="0.1524" layer="91"/>
 <junction x="71.12" y="93.98"/>
+<pinref part="U$10" gate="G$1" pin="P_2"/>
 </segment>
 <segment>
 <pinref part="U$2" gate="G$1" pin="LVGATE"/>
@@ -3094,7 +3011,6 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </segment>
 <segment>
 <label x="124.46" y="73.66" size="1.778" layer="95"/>
-<pinref part="R11" gate="G$1" pin="1"/>
 <wire x1="119.38" y1="45.72" x2="119.38" y2="73.66" width="0.1524" layer="91"/>
 <pinref part="D1" gate="G$1" pin="C"/>
 <wire x1="99.06" y1="73.66" x2="111.76" y2="73.66" width="0.1524" layer="91"/>
@@ -3102,8 +3018,9 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <wire x1="119.38" y1="73.66" x2="127" y2="73.66" width="0.1524" layer="91"/>
 <junction x="119.38" y="73.66"/>
 <junction x="111.76" y="73.66"/>
-<pinref part="C3" gate="G$1" pin="1"/>
 <wire x1="111.76" y1="71.12" x2="111.76" y2="73.66" width="0.1524" layer="91"/>
+<pinref part="C7" gate="G$1" pin="1"/>
+<pinref part="R4" gate="G$1" pin="1"/>
 </segment>
 </net>
 <net name="N$7" class="0">
@@ -3118,17 +3035,17 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <pinref part="R2" gate="G$1" pin="1"/>
 <pinref part="R1" gate="G$1" pin="2"/>
 <wire x1="101.6" y1="160.02" x2="96.52" y2="160.02" width="0.1524" layer="91"/>
-<pinref part="C2" gate="G$1" pin="1"/>
 <wire x1="96.52" y1="160.02" x2="91.44" y2="160.02" width="0.1524" layer="91"/>
 <wire x1="96.52" y1="157.48" x2="96.52" y2="160.02" width="0.1524" layer="91"/>
 <junction x="96.52" y="160.02"/>
+<pinref part="C3" gate="G$1" pin="1"/>
 </segment>
 </net>
 <net name="N$27" class="0">
 <segment>
-<pinref part="C2" gate="G$1" pin="2"/>
 <pinref part="R5" gate="G$1" pin="2"/>
 <wire x1="96.52" y1="149.86" x2="96.52" y2="134.62" width="0.1524" layer="91"/>
+<pinref part="C3" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="N$31" class="0">
@@ -3161,11 +3078,11 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <wire x1="71.12" y1="30.48" x2="71.12" y2="33.02" width="0.1524" layer="91"/>
 <junction x="71.12" y="33.02"/>
 <wire x1="71.12" y1="33.02" x2="119.38" y2="33.02" width="0.1524" layer="91"/>
-<pinref part="R11" gate="G$1" pin="2"/>
-<pinref part="R12" gate="G$1" pin="1"/>
 <wire x1="119.38" y1="35.56" x2="119.38" y2="33.02" width="0.1524" layer="91"/>
 <junction x="119.38" y="33.02"/>
 <wire x1="119.38" y1="33.02" x2="119.38" y2="30.48" width="0.1524" layer="91"/>
+<pinref part="R4" gate="G$1" pin="2"/>
+<pinref part="R8" gate="G$1" pin="1"/>
 </segment>
 </net>
 <net name="N$14" class="0">
@@ -3179,24 +3096,24 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <pinref part="U$2" gate="G$1" pin="CSP"/>
 <wire x1="63.5" y1="43.18" x2="73.66" y2="43.18" width="0.1524" layer="91"/>
 <wire x1="73.66" y1="43.18" x2="73.66" y2="48.26" width="0.1524" layer="91"/>
-<pinref part="Q1" gate="G$1" pin="S"/>
 <pinref part="R13" gate="G$1" pin="1"/>
 <wire x1="73.66" y1="48.26" x2="78.74" y2="48.26" width="0.1524" layer="91"/>
+<pinref part="U$4" gate="G$1" pin="S"/>
 <junction x="78.74" y="48.26"/>
 </segment>
 </net>
 <net name="SDOT" class="0">
 <segment>
 <pinref part="D1" gate="G$1" pin="A"/>
-<pinref part="U$4" gate="G$1" pin="S_DOT"/>
 <wire x1="93.98" y1="73.66" x2="90.424" y2="73.66" width="0.1524" layer="91"/>
+<pinref part="U$10" gate="G$1" pin="S_DOT"/>
 </segment>
 </net>
 <net name="N$2" class="0">
 <segment>
 <pinref part="U$2" gate="G$1" pin="HVGATE"/>
 <wire x1="63.5" y1="53.34" x2="71.12" y2="53.34" width="0.1524" layer="91"/>
-<pinref part="Q1" gate="G$1" pin="G"/>
+<pinref part="U$4" gate="G$1" pin="G"/>
 </segment>
 </net>
 <net name="N$3" class="0">
@@ -3212,14 +3129,14 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <wire x1="71.12" y1="68.58" x2="71.12" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="71.12" y1="68.58" x2="78.74" y2="68.58" width="0.1524" layer="91"/>
 <wire x1="78.74" y1="68.58" x2="78.74" y2="65.278" width="0.1524" layer="91"/>
-<pinref part="U$4" gate="G$1" pin="P_DOT"/>
 <wire x1="82.296" y1="65.278" x2="78.74" y2="65.278" width="0.1524" layer="91"/>
 <wire x1="78.74" y1="65.278" x2="78.74" y2="63.5" width="0.1524" layer="91"/>
 <pinref part="R15" gate="G$1" pin="2"/>
 <wire x1="78.74" y1="63.5" x2="78.74" y2="58.42" width="0.1524" layer="91"/>
 <wire x1="76.2" y1="63.5" x2="78.74" y2="63.5" width="0.1524" layer="91"/>
 <junction x="78.74" y="63.5"/>
-<pinref part="Q1" gate="G$1" pin="D"/>
+<pinref part="U$10" gate="G$1" pin="P_DOT"/>
+<pinref part="U$4" gate="G$1" pin="D"/>
 </segment>
 </net>
 </nets>