From b8a4e2c895116b4beb4eabcd23eb3ca94df7752c Mon Sep 17 00:00:00 2001
From: Eugeniy Mikhailov <evgmik@gmail.com>
Date: Tue, 17 Jun 2014 09:49:28 -0400
Subject: LockIn updates from Owen

---
 LockInAmp_v2014/LockInAmp.brd | 728 ++++++++++++++++++++++++++++++------------
 LockInAmp_v2014/LockInAmp.pro |  30 +-
 LockInAmp_v2014/LockInAmp.sch | 718 +++++++++++++++++++++++++++--------------
 3 files changed, 1006 insertions(+), 470 deletions(-)

(limited to 'LockInAmp_v2014')

diff --git a/LockInAmp_v2014/LockInAmp.brd b/LockInAmp_v2014/LockInAmp.brd
index 9f2e13e..49daf3d 100644
--- a/LockInAmp_v2014/LockInAmp.brd
+++ b/LockInAmp_v2014/LockInAmp.brd
@@ -20,8 +20,8 @@
 <layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
@@ -126,9 +126,51 @@
 </library>
 <library name="evmik_rcl">
 <packages>
+<package name="0805">
+<wire x1="-0.41" y1="0.635" x2="0.41" y2="0.635" width="0.1524" layer="51"/>
+<wire x1="-0.41" y1="-0.635" x2="0.41" y2="-0.635" width="0.1524" layer="51"/>
+<wire x1="-1.973" y1="0.983" x2="1.973" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="1.973" y1="0.983" x2="1.973" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="1.973" y1="-0.983" x2="-1.973" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="-1.973" y1="-0.983" x2="-1.973" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="-0.635" y1="1.27" x2="-1.905" y2="1.27" width="0.127" layer="21"/>
+<wire x1="-1.905" y1="1.27" x2="-1.905" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="-1.905" y1="-1.27" x2="-0.635" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-1.27" x2="1.905" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="1.905" y1="-1.27" x2="1.905" y2="1.27" width="0.127" layer="21"/>
+<wire x1="1.905" y1="1.27" x2="0.635" y2="1.27" width="0.127" layer="21"/>
+<smd name="1" x="-0.95" y="0" dx="1.3" dy="1.5" layer="1"/>
+<smd name="2" x="0.95" y="0" dx="1.3" dy="1.5" layer="1"/>
+<text x="0" y="1.397" size="1.016" layer="25" font="vector" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-1.524" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+<rectangle x1="0.4064" y1="-0.6985" x2="1.0564" y2="0.7015" layer="51"/>
+<rectangle x1="-1.0668" y1="-0.6985" x2="-0.4168" y2="0.7015" layer="51"/>
+<rectangle x1="-0.1999" y1="-0.5001" x2="0.1999" y2="0.5001" layer="35"/>
+</package>
 <package name="1206">
 <wire x1="0.9525" y1="-0.8128" x2="-0.9652" y2="-0.8128" width="0.1524" layer="51"/>
 <wire x1="0.9525" y1="0.8128" x2="-0.9652" y2="0.8128" width="0.1524" layer="51"/>
+<wire x1="-2.473" y1="1.143" x2="2.473" y2="1.143" width="0.0508" layer="39"/>
+<wire x1="2.473" y1="1.143" x2="2.473" y2="-1.143" width="0.0508" layer="39"/>
+<wire x1="2.473" y1="-1.143" x2="-2.473" y2="-1.143" width="0.0508" layer="39"/>
+<wire x1="-2.473" y1="-1.143" x2="-2.473" y2="1.143" width="0.0508" layer="39"/>
+<wire x1="-1.27" y1="1.27" x2="-2.54" y2="1.27" width="0.127" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="-2.54" y1="-1.27" x2="-1.27" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="1.27" y1="-1.27" x2="2.54" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="2.54" y1="-1.27" x2="2.54" y2="1.27" width="0.127" layer="21"/>
+<wire x1="2.54" y1="1.27" x2="1.27" y2="1.27" width="0.127" layer="21"/>
+<smd name="2" x="1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
+<smd name="1" x="-1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
+<text x="0" y="1.397" size="1.016" layer="25" font="vector" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-1.524" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+<rectangle x1="-1.6891" y1="-0.8763" x2="-0.9525" y2="0.8763" layer="51"/>
+<rectangle x1="0.9525" y1="-0.8763" x2="1.6891" y2="0.8763" layer="51"/>
+<rectangle x1="-0.3" y1="-0.7" x2="0.3" y2="0.7" layer="35"/>
+</package>
+<package name="POL1206">
+<wire x1="0.9525" y1="-0.8128" x2="-0.9652" y2="-0.8128" width="0.1524" layer="51"/>
+<wire x1="0.9525" y1="0.8128" x2="-0.9652" y2="0.8128" width="0.1524" layer="51"/>
 <wire x1="-2.473" y1="0.983" x2="2.473" y2="0.983" width="0.0508" layer="39"/>
 <wire x1="2.473" y1="0.983" x2="2.473" y2="-0.983" width="0.0508" layer="39"/>
 <wire x1="2.473" y1="-0.983" x2="-2.473" y2="-0.983" width="0.0508" layer="39"/>
@@ -139,10 +181,12 @@
 <wire x1="1.27" y1="-1.27" x2="2.54" y2="-1.27" width="0.127" layer="21"/>
 <wire x1="2.54" y1="-1.27" x2="2.54" y2="1.27" width="0.127" layer="21"/>
 <wire x1="2.54" y1="1.27" x2="1.27" y2="1.27" width="0.127" layer="21"/>
-<smd name="2" x="1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
-<smd name="1" x="-1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
-<text x="-1.27" y="1.397" size="1.016" layer="25" font="vector">&gt;NAME</text>
-<text x="-1.27" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
+<wire x1="-2.032" y1="2.413" x2="-2.032" y2="1.651" width="0.127" layer="21"/>
+<wire x1="-1.651" y1="2.032" x2="-2.413" y2="2.032" width="0.127" layer="21"/>
+<smd name="-" x="1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
+<smd name="+" x="-1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
+<text x="0" y="1.524" size="1.016" layer="25" font="vector" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-1.524" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
 <rectangle x1="-1.6891" y1="-0.8763" x2="-0.9525" y2="0.8763" layer="51"/>
 <rectangle x1="0.9525" y1="-0.8763" x2="1.6891" y2="0.8763" layer="51"/>
 <rectangle x1="-0.3" y1="-0.7" x2="0.3" y2="0.7" layer="35"/>
@@ -179,17 +223,113 @@
 <package name="13">
 <circle x="0" y="0" radius="0.762" width="0.1524" layer="51"/>
 <pad name="TP" x="0" y="0" drill="1.3208" diameter="2.159" shape="octagon"/>
-<text x="-1.016" y="1.27" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="0" y="1.778" size="1.27" layer="25" ratio="10" align="bottom-center">&gt;NAME</text>
 <text x="0" y="0" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-1.27" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
 <rectangle x1="-0.3302" y1="-0.3302" x2="0.3302" y2="0.3302" layer="51"/>
 </package>
 </packages>
 </library>
-<library name="QuantumOptics">
-<description>&lt;b&gt;U of T Physics, Quantum Optics Labs&lt;/b&gt;&lt;p&gt;
-&lt;author&gt;Created by Alan Stummer, Nov '03&lt;/author&gt;&lt;p&gt;
-Various devices, symbols and packages used here.</description>
+<library name="evmik_switches">
+<packages>
+<package name="3PIN">
+<wire x1="-3.81" y1="-2.54" x2="-3.81" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-3.81" y1="-2.54" x2="3.81" y2="-2.54" width="0.2032" layer="21"/>
+<wire x1="3.81" y1="3.175" x2="2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="2.54" y1="3.175" x2="-2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="3.175" x2="-3.81" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="3.81" y1="3.175" x2="3.81" y2="-2.54" 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="0" y="4.3688" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="5.9609" size="1.27" layer="27" align="bottom-center">&gt;VALUE</text>
+<text x="0" y="-4.445" size="1.27" layer="21" align="bottom-center">2</text>
+<wire x1="-2.54" y1="3.175" x2="-2.54" y2="2.54" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="2.54" x2="2.54" y2="2.54" width="0.2032" layer="21"/>
+<wire x1="2.54" y1="2.54" x2="2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-3.81" y1="3.175" x2="-3.81" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.81" y1="-2.54" x2="3.81" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.81" y1="-2.54" x2="3.81" y2="3.175" width="0.2032" layer="51"/>
+<wire x1="3.81" y1="3.175" x2="-3.81" y2="3.175" width="0.2032" layer="51"/>
+<wire x1="-4.445" y1="3.81" x2="-4.445" y2="-3.175" width="0.127" layer="39"/>
+<wire x1="-4.445" y1="-3.175" x2="4.445" y2="-3.175" width="0.127" layer="39"/>
+<wire x1="4.445" y1="-3.175" x2="4.445" y2="3.81" width="0.127" layer="39"/>
+<wire x1="4.445" y1="3.81" x2="-4.445" y2="3.81" width="0.127" layer="39"/>
+<text x="-2.54" y="-4.445" size="1.27" layer="21" align="bottom-center">1</text>
+<text x="2.54" y="-4.445" size="1.27" layer="21" align="bottom-center">3</text>
+</package>
+</packages>
+</library>
+<library name="evmik_trimmers">
+<packages>
+<package name="3PIN">
+<wire x1="-3.81" y1="-2.54" x2="-3.81" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-3.81" y1="-2.54" x2="3.81" y2="-2.54" width="0.2032" layer="21"/>
+<wire x1="3.81" y1="3.175" x2="2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="2.54" y1="3.175" x2="-2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="3.175" x2="-3.81" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="3.81" y1="3.175" x2="3.81" y2="-2.54" 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="0" y="4.3688" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="5.9609" size="1.27" layer="27" align="bottom-center">&gt;VALUE</text>
+<text x="0" y="-4.445" size="1.27" layer="21" align="bottom-center">2</text>
+<wire x1="-2.54" y1="3.175" x2="-2.54" y2="2.54" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="2.54" x2="2.54" y2="2.54" width="0.2032" layer="21"/>
+<wire x1="2.54" y1="2.54" x2="2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-3.81" y1="3.175" x2="-3.81" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.81" y1="-2.54" x2="3.81" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.81" y1="-2.54" x2="3.81" y2="3.175" width="0.2032" layer="51"/>
+<wire x1="3.81" y1="3.175" x2="-3.81" y2="3.175" width="0.2032" layer="51"/>
+<wire x1="-4.445" y1="3.81" x2="-4.445" y2="-3.175" width="0.127" layer="39"/>
+<wire x1="-4.445" y1="-3.175" x2="4.445" y2="-3.175" width="0.127" layer="39"/>
+<wire x1="4.445" y1="-3.175" x2="4.445" y2="3.81" width="0.127" layer="39"/>
+<wire x1="4.445" y1="3.81" x2="-4.445" y2="3.81" width="0.127" layer="39"/>
+<text x="-2.54" y="-4.445" size="1.27" layer="21" align="bottom-center">1</text>
+<text x="2.54" y="-4.445" size="1.27" layer="21" align="bottom-center">3</text>
+</package>
+<package name="3386F">
+<circle x="0" y="0" radius="1.4199" width="0.2032" layer="21"/>
+<pad name="1" x="-2.54" y="2.54" drill="1"/>
+<pad name="2" x="0" y="-2.54" drill="1"/>
+<pad name="3" x="2.54" y="2.54" drill="1"/>
+<text x="0.025" y="5.475" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<rectangle x1="-1.016" y1="-0.254" x2="1.016" y2="0.254" layer="21"/>
+<rectangle x1="-0.254" y1="-1.016" x2="0.254" y2="1.016" layer="21"/>
+<wire x1="-5.08" y1="5.08" x2="-5.08" y2="-5.08" width="0.127" layer="51"/>
+<wire x1="-5.08" y1="-5.08" x2="5.08" y2="-5.08" width="0.127" layer="51"/>
+<wire x1="5.08" y1="-5.08" x2="5.08" y2="5.08" width="0.127" layer="51"/>
+<wire x1="5.08" y1="5.08" x2="-5.08" y2="5.08" width="0.127" layer="51"/>
+<wire x1="-5.08" y1="5.08" x2="5.08" y2="5.08" width="0.0508" layer="39"/>
+<wire x1="5.08" y1="5.08" x2="5.08" y2="-5.08" width="0.0508" layer="39"/>
+<wire x1="5.08" y1="-5.08" x2="-5.08" y2="-5.08" width="0.0508" layer="39"/>
+<wire x1="-5.08" y1="-5.08" x2="-5.08" y2="5.08" width="0.0508" layer="39"/>
+<wire x1="-5.08" y1="5.08" x2="5.08" y2="5.08" width="0.2032" layer="21"/>
+<wire x1="5.08" y1="5.08" x2="5.08" y2="-5.08" width="0.2032" layer="21"/>
+<wire x1="5.08" y1="-5.08" x2="4.445" y2="-5.08" width="0.2032" layer="21"/>
+<wire x1="4.445" y1="-5.08" x2="4.445" y2="-4.445" width="0.2032" layer="21"/>
+<wire x1="4.445" y1="-4.445" x2="-4.445" y2="-4.445" width="0.2032" layer="21"/>
+<wire x1="-4.445" y1="-4.445" x2="-4.445" y2="-5.08" width="0.2032" layer="21"/>
+<wire x1="-4.445" y1="-5.08" x2="-5.08" y2="-5.08" width="0.2032" layer="21"/>
+<wire x1="-5.08" y1="-5.08" x2="-5.08" y2="5.08" width="0.2032" layer="21"/>
+</package>
+</packages>
+</library>
+<library name="evmik_mounting_holes">
+<packages>
+<package name="0.167DRILL">
+<rectangle x1="-5.08" y1="-5.08" x2="5.08" y2="5.08" layer="29"/>
+<rectangle x1="-5.08" y1="-5.08" x2="5.08" y2="5.08" layer="30"/>
+<rectangle x1="-5.08" y1="-5.08" x2="5.08" y2="5.08" layer="39"/>
+<rectangle x1="-5.08" y1="-5.08" x2="5.08" y2="5.08" layer="40"/>
+<rectangle x1="-5.08" y1="-5.08" x2="5.08" y2="5.08" layer="41"/>
+<rectangle x1="-5.08" y1="-5.08" x2="5.08" y2="5.08" layer="42"/>
+<hole x="0" y="0" drill="4.2418"/>
+</package>
+</packages>
+</library>
+<library name="evmik_bnc_sma_connectors">
 <packages>
 <package name="CONN-BNC-AMP-TYPE3HORIZ">
 <description>&lt;b&gt;BNC PCB &lt;u&gt;Horizontal&lt;/u&gt; mount connector&lt;/b&gt;, Amp, horizontal, 0.1" grid, types such as 227677-1.&lt;br&gt;
@@ -202,7 +342,6 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;PN=227677-1&amp;M=S
 <wire x1="7.62" y1="-14.605" x2="7.62" y2="0" width="0.254" layer="21"/>
 <wire x1="7.62" y1="0" x2="6.35" y2="0" width="0.254" layer="49"/>
 <wire x1="6.35" y1="0" x2="-1.905" y2="0" width="0.254" layer="49"/>
-<wire x1="-1.905" y1="0" x2="-6.35" y2="0" width="0.254" layer="49"/>
 <wire x1="-6.35" y1="0" x2="-7.62" y2="0" width="0.254" layer="49"/>
 <wire x1="-6.35" y1="8.89" x2="-6.35" y2="6.985" width="0.254" layer="49" style="shortdash"/>
 <wire x1="-6.35" y1="6.985" x2="-6.35" y2="4.445" width="0.254" layer="49" style="shortdash"/>
@@ -221,68 +360,20 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;PN=227677-1&amp;M=S
 <wire x1="-6.35" y1="4.445" x2="6.35" y2="6.35" width="0.254" layer="49" style="shortdash"/>
 <wire x1="-6.35" y1="1.905" x2="6.35" y2="3.81" width="0.254" layer="49" style="shortdash"/>
 <wire x1="-1.905" y1="0" x2="6.35" y2="1.27" width="0.254" layer="49" style="shortdash"/>
-<wire x1="-7.62" y1="-15.24" x2="-7.62" y2="0" width="0.2032" layer="21"/>
-<wire x1="7.62" y1="0" x2="7.62" y2="-15.24" width="0.2032" layer="21"/>
-<wire x1="7.62" y1="-15.24" x2="3.81" y2="-15.24" width="0.2032" layer="41"/>
-<wire x1="3.81" y1="-15.24" x2="3.81" y2="-11.43" width="0.2032" layer="41"/>
-<wire x1="3.81" y1="-11.43" x2="2.54" y2="-10.16" width="0.2032" layer="41"/>
-<wire x1="2.54" y1="-10.16" x2="2.54" y2="-2.54" width="0.2032" layer="41"/>
-<wire x1="2.54" y1="-2.54" x2="-2.54" y2="-2.54" width="0.2032" layer="41"/>
-<wire x1="-2.54" y1="-2.54" x2="-2.54" y2="-10.16" width="0.2032" layer="41"/>
-<wire x1="-2.54" y1="-10.16" x2="-3.81" y2="-11.43" width="0.2032" layer="41"/>
-<wire x1="-3.81" y1="-11.43" x2="-3.81" y2="-15.24" width="0.2032" layer="41"/>
-<wire x1="-3.81" y1="-15.24" x2="-7.62" y2="-15.24" width="0.2032" layer="41"/>
-<wire x1="-7.62" y1="-15.24" x2="-7.62" y2="0" width="0.2032" layer="41"/>
-<wire x1="-7.62" y1="0" x2="7.62" y2="0" width="0.2032" layer="49" style="shortdash"/>
-<wire x1="7.62" y1="0" x2="7.62" y2="-15.24" width="0.2032" layer="41"/>
 <circle x="0" y="18.415" radius="0.635" width="0" layer="49"/>
-<circle x="-5.08" y="-7.62" radius="2.54" width="0.2032" layer="42"/>
-<circle x="5.08" y="-7.62" radius="2.54" width="0.2032" layer="42"/>
 <pad name="CONDUCTOR" x="0" y="-12.7" drill="1.0668" shape="octagon"/>
-<pad name="SHIELD" x="-2.54" y="-12.7" drill="1.0668" shape="octagon"/>
+<pad name="SHIELD1" x="-2.54" y="-12.7" drill="1.0668" shape="octagon"/>
 <pad name="P$1" x="-5.08" y="-7.62" drill="2.1844" shape="octagon"/>
 <pad name="P$2" x="5.08" y="-7.62" drill="2.1844" shape="octagon"/>
-<text x="-4.318" y="-11.049" size="1.778" layer="25" font="vector">&gt;NAME</text>
+<pad name="SHIELD2" x="2.54" y="-12.7" drill="1.0668" shape="octagon"/>
+<text x="0" y="-15.24" size="1.778" layer="25" font="vector" align="top-center">&gt;NAME</text>
 <text x="-3.937" y="-4.318" size="1.778" layer="27" font="vector">&gt;VALUE</text>
-</package>
-</packages>
-</library>
-<library name="evmik_switches">
-<packages>
-<package name="SWITCH1AS">
-<wire x1="-6.35" y1="3.81" x2="6.35" y2="3.81" width="0.2032" layer="21"/>
-<wire x1="6.35" y1="3.81" x2="6.35" y2="-7.62" width="0.2032" layer="21"/>
-<wire x1="6.35" y1="-7.62" x2="-6.35" y2="-7.62" width="0.2032" layer="21"/>
-<wire x1="-6.35" y1="-7.62" x2="-6.35" y2="3.81" width="0.2032" layer="21"/>
-<pad name="M2" x="2.54" y="2.54" drill="1.3" diameter="1.9304"/>
-<pad name="1" x="-4.699" y="-8.89" drill="0.8" diameter="1.9304" rot="R90"/>
-<pad name="M1" x="-2.54" y="2.54" drill="1.3" diameter="1.9304"/>
-<pad name="2" x="0" y="-8.89" drill="0.8" diameter="1.9304" rot="R90"/>
-<pad name="3" x="4.699" y="-8.89" drill="0.8" diameter="1.9304" rot="R90"/>
-<text x="-6.604" y="-5.715" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<text x="7.874" y="-5.715" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
-<wire x1="2.9845" y1="3.81" x2="2.9845" y2="7.874" width="0.2032" layer="27"/>
-<wire x1="2.9845" y1="7.874" x2="-2.9845" y2="7.874" width="0.2032" layer="27"/>
-<wire x1="-2.9845" y1="7.874" x2="-2.9845" y2="3.81" width="0.2032" layer="27"/>
-</package>
-</packages>
-</library>
-<library name="evmik_trimmers">
-<packages>
-<package name="3362S">
-<pad name="2" x="0" y="-2.54" drill="0.7" diameter="1.016"/>
-<pad name="3" x="2.54" y="0" drill="0.7" diameter="1.016"/>
-<pad name="1" x="-2.54" y="0" drill="0.7" diameter="1.016"/>
-<wire x1="-3.81" y1="1.27" x2="3.81" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="3.81" y1="1.27" x2="3.81" y2="-3.81" width="0.2032" layer="21"/>
-<wire x1="-3.81" y1="-3.81" x2="-3.81" y2="1.27" width="0.2032" layer="21"/>
-<text x="-3.81" y="-3.81" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<text x="5.08" y="-3.81" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
-<wire x1="-3.81" y1="-3.81" x2="-3.175" y2="-3.81" width="0.127" layer="21"/>
-<wire x1="-3.175" y1="-3.81" x2="-3.175" y2="-3.556" width="0.127" layer="21"/>
-<wire x1="-3.175" y1="-3.556" x2="3.175" y2="-3.556" width="0.127" layer="21"/>
-<wire x1="3.175" y1="-3.556" x2="3.175" y2="-3.81" width="0.127" layer="21"/>
-<wire x1="3.175" y1="-3.81" x2="3.81" y2="-3.81" width="0.127" layer="21"/>
+<wire x1="-6.35" y1="0" x2="-1.27" y2="0" width="0.254" layer="21"/>
+<wire x1="-7.62" y1="0" x2="7.62" y2="0" width="0.254" layer="51"/>
+<wire x1="7.62" y1="0" x2="7.62" y2="-14.605" width="0.254" layer="51"/>
+<wire x1="7.62" y1="-14.605" x2="-7.62" y2="-14.605" width="0.254" layer="51"/>
+<wire x1="-7.62" y1="-14.605" x2="-7.62" y2="0" width="0.254" layer="51"/>
+<rectangle x1="-7.62" y1="-14.605" x2="7.62" y2="0" layer="39"/>
 </package>
 </packages>
 </library>
@@ -313,9 +404,9 @@ design rules under a new name.</description>
 <param name="layerSetup" value="(1*16)"/>
 <param name="mtCopper" value="0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm"/>
 <param name="mtIsolate" value="1.5mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm"/>
-<param name="mdWireWire" value="8mil"/>
-<param name="mdWirePad" value="8mil"/>
-<param name="mdWireVia" value="8mil"/>
+<param name="mdWireWire" value="24mil"/>
+<param name="mdWirePad" value="24mil"/>
+<param name="mdWireVia" value="24mil"/>
 <param name="mdPadPad" value="8mil"/>
 <param name="mdPadVia" value="8mil"/>
 <param name="mdViaVia" value="8mil"/>
@@ -327,7 +418,7 @@ design rules under a new name.</description>
 <param name="mdCopperDimension" value="40mil"/>
 <param name="mdDrill" value="8mil"/>
 <param name="mdSmdStop" value="0mil"/>
-<param name="msWidth" value="24mil"/>
+<param name="msWidth" value="25mil"/>
 <param name="msDrill" value="24mil"/>
 <param name="msMicroVia" value="9.99mm"/>
 <param name="msBlindViaRatio" value="0.5"/>
@@ -472,57 +563,119 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="U$1" library="ev_mikhlaserlock" package="AD630" value="AD630" x="66.04" y="59.69" rot="R270"/>
-<element name="INGN" library="evmik_opamp" package="DIP8" value="" x="34.29" y="25.4" rot="R270"/>
-<element name="ALPS" library="evmik_opamp" package="DIP8" value="" x="13.97" y="38.1" rot="R270"/>
-<element name="R5" library="evmik_rcl" package="1206" value="10k" x="30.48" y="34.29" rot="R90"/>
-<element name="R7" library="evmik_rcl" package="1206" value="1k" x="45.72" y="29.21"/>
-<element name="15_EXT2" library="evmik_connectors_3pin" package="3_PIN_THRUGH_HOLE_LABELED" value="15V_3PIN" x="10.16" y="60.96"/>
-<element name="15V_EXT1" library="evmik_connectors_3pin" package="3_PIN_THRUGH_HOLE_LABELED" value="15V_3PIN" x="10.16" y="52.07"/>
-<element name="C1" library="evmik_rcl" package="1206" value="1u" x="45.72" y="24.13"/>
-<element name="OUT" library="evmik_opamp" package="DIP8" value="" x="26.67" y="58.42" rot="R270"/>
-<element name="R1" library="evmik_rcl" package="1206" value="100k" x="22.86" y="35.56"/>
-<element name="C2" library="evmik_rcl" package="1206" value="70uF" x="49.53" y="35.56"/>
-<element name="LIOUT" library="evmik_testpads" package="13" value="TP-13" x="88.9" y="71.12"/>
-<element name="PREAMP" library="evmik_testpads" package="13" value="TP-13" x="58.42" y="71.12"/>
-<element name="PHASE" library="evmik_testpads" package="13" value="TP-13" x="73.66" y="71.12"/>
-<element name="GND" library="evmik_testpads" package="13" value="TP-13" x="58.42" y="64.77"/>
-<element name="R2" library="evmik_rcl" package="1206" value="1k" x="63.5" y="41.91"/>
-<element name="INVT" library="evmik_opamp" package="DIP8" value="" x="44.45" y="53.34" rot="R270"/>
-<element name="R3" library="evmik_rcl" package="1206" value="1k" x="57.15" y="41.91"/>
-<element name="R4" library="evmik_rcl" package="1206" value="1k" x="50.8" y="41.91"/>
-<element name="R6" library="evmik_rcl" package="1206" value="1k" x="38.1" y="41.91"/>
-<element name="REFERENCE" library="QuantumOptics" package="CONN-BNC-AMP-TYPE3HORIZ" value="" x="53.34" y="0" rot="R180"/>
-<element name="INPUT" library="QuantumOptics" package="CONN-BNC-AMP-TYPE3HORIZ" value="" x="21.59" y="0" rot="R180"/>
-<element name="OUTPUT" library="QuantumOptics" package="CONN-BNC-AMP-TYPE3HORIZ" value="" x="81.28" y="0" rot="R180"/>
-<element name="VIN" library="evmik_testpads" package="13" value="TP-13" x="85.09" y="35.56"/>
-<element name="VREF" library="evmik_testpads" package="13" value="TP-13" x="54.61" y="35.56"/>
-<element name="VOUT" library="evmik_testpads" package="13" value="TP-13" x="69.85" y="35.56"/>
-<element name="INBUF" library="evmik_opamp" package="DIP8" value="" x="13.97" y="25.4" rot="R270"/>
-<element name="C4" library="evmik_rcl" package="1206" value="22u" x="24.13" y="24.13"/>
-<element name="R9" library="evmik_rcl" package="1206" value="1k" x="25.4" y="17.78" rot="R270"/>
-<element name="R10" library="evmik_rcl" package="1206" value="100k" x="95.25" y="41.91"/>
-<element name="R11" library="evmik_rcl" package="1206" value="100k" x="88.9" y="41.91"/>
-<element name="C5" library="evmik_rcl" package="1206" value="70uF" x="43.18" y="35.56"/>
-<element name="C6" library="evmik_rcl" package="1206" value="70uF" x="36.83" y="35.56"/>
-<element name="SWITCH" library="evmik_switches" package="SWITCH1AS" value="SWITCH1AS" x="38.1" y="5.08" rot="R180"/>
-<element name="VGAIN" library="evmik_trimmers" package="3362S" value="3362S" x="86.36" y="29.21"/>
-<element name="VPHASE" library="evmik_trimmers" package="3362S" value="3362S" x="60.96" y="21.59" rot="R180"/>
-<element name="+15V" library="evmik_testpads" package="13" value="TP-13" x="88.9" y="64.77"/>
-<element name="-15V" library="evmik_testpads" package="13" value="TP-13" x="73.66" y="64.77"/>
-<element name="C3" library="evmik_rcl" package="1206" value="15p" x="76.2" y="41.91"/>
-<element name="INVERTER" library="evmik_testpads" package="13" value="TP-13" x="43.18" y="64.77"/>
-<element name="R8" library="evmik_rcl" package="1206" value="1k" x="19.05" y="45.72"/>
-<element name="R12" library="evmik_rcl" package="1206" value="1k" x="77.47" y="48.26"/>
-<element name="REFV" library="evmik_testpads" package="13" value="TP-13" x="43.18" y="71.12"/>
+<element name="U$1" library="ev_mikhlaserlock" package="AD630" value="AD630" x="62.23" y="55.88" rot="R270"/>
+<element name="INGN" library="evmik_opamp" package="DIP8" value="" x="21.59" y="39.37" rot="R270"/>
+<element name="ALPS" library="evmik_opamp" package="DIP8" value="" x="40.64" y="52.07" rot="R270"/>
+<element name="R5" library="evmik_rcl" package="1206" value="10k" x="13.97" y="43.18" rot="R90"/>
+<element name="R7" library="evmik_rcl" package="1206" value="1k" x="30.48" y="50.8" rot="R90"/>
+<element name="POWER_OUT" library="evmik_connectors_3pin" package="3_PIN_THRUGH_HOLE_LABELED" value="15V_3PIN" x="8.89" y="60.96"/>
+<element name="POWER_IN" library="evmik_connectors_3pin" package="3_PIN_THRUGH_HOLE_LABELED" value="15V_3PIN" x="8.89" y="38.1"/>
+<element name="C1" library="evmik_rcl" package="0805" value="1u" x="30.48" y="39.37" rot="R270"/>
+<element name="OUT" library="evmik_opamp" package="DIP8" value="" x="82.55" y="25.4" smashed="yes" rot="R270">
+<attribute name="NAME" x="77.216" y="25.019" size="1.27" layer="25" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="81.915" y="28.956" size="1.27" layer="27" ratio="10" rot="R270"/>
+</element>
+<element name="R1" library="evmik_rcl" package="1206" value="100k" x="90.17" y="49.53"/>
+<element name="C2" library="evmik_rcl" package="0805" value="70uF" x="91.44" y="43.18" smashed="yes" rot="R270">
+<attribute name="NAME" x="89.027" y="44.45" size="1.016" layer="25" font="vector" rot="R270"/>
+<attribute name="VALUE" x="88.9" y="44.45" size="1.27" layer="27" rot="R270"/>
+</element>
+<element name="LIOUT" library="evmik_testpads" package="13" value="TP-13" x="72.39" y="54.61"/>
+<element name="PREAMP" library="evmik_testpads" package="13" value="TP-13" x="30.48" y="43.18" smashed="yes">
+<attribute name="NAME" x="33.02" y="43.434" size="1.27" layer="25" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="30.48" y="43.18" size="0.0254" layer="27"/>
+</element>
+<element name="PHASE" library="evmik_testpads" package="13" value="TP-13" x="48.26" y="50.8" smashed="yes">
+<attribute name="NAME" x="48.514" y="48.26" size="1.27" layer="25" ratio="10"/>
+<attribute name="VALUE" x="48.26" y="50.8" size="0.0254" layer="27"/>
+</element>
+<element name="GND" library="evmik_testpads" package="13" value="TP-13" x="10.16" y="66.04"/>
+<element name="R2" library="evmik_rcl" package="1206" value="1k" x="40.64" y="60.96"/>
+<element name="INVT" library="evmik_opamp" package="DIP8" value="" x="57.15" y="25.4" rot="R270"/>
+<element name="R3" library="evmik_rcl" package="1206" value="1k" x="48.26" y="25.4" rot="R90"/>
+<element name="R4" library="evmik_rcl" package="1206" value="1k" x="57.15" y="34.29"/>
+<element name="R6" library="evmik_rcl" package="1206" value="1k" x="39.37" y="20.32" rot="R90"/>
+<element name="REFERENCE" library="evmik_bnc_sma_connectors" package="CONN-BNC-AMP-TYPE3HORIZ" value="CONN-BNCTYPE3HORIZ" x="53.34" y="0" smashed="yes" rot="R180">
+<attribute name="NAME" x="62.611" y="15.748" size="1.778" layer="25" font="vector" rot="R270"/>
+<attribute name="VALUE" x="57.277" y="4.318" size="1.778" layer="27" font="vector" rot="R180"/>
+</element>
+<element name="INPUT" library="evmik_bnc_sma_connectors" package="CONN-BNC-AMP-TYPE3HORIZ" value="CONN-BNCTYPE3HORIZ" x="21.59" y="0" smashed="yes" rot="R180">
+<attribute name="NAME" x="11.811" y="13.208" size="1.778" layer="25" font="vector" rot="R270"/>
+<attribute name="VALUE" x="25.527" y="4.318" size="1.778" layer="27" font="vector" rot="R180"/>
+</element>
+<element name="OUTPUT" library="evmik_bnc_sma_connectors" package="CONN-BNC-AMP-TYPE3HORIZ" value="CONN-BNCTYPE3HORIZ" x="81.28" y="0" smashed="yes" rot="R180">
+<attribute name="NAME" x="90.551" y="20.828" size="1.778" layer="25" font="vector" rot="R270"/>
+<attribute name="VALUE" x="85.217" y="4.318" size="1.778" layer="27" font="vector" rot="R180"/>
+</element>
+<element name="VIN" library="evmik_testpads" package="13" value="TP-13" x="8.89" y="21.59"/>
+<element name="VREF" library="evmik_testpads" package="13" value="TP-13" x="48.26" y="17.78"/>
+<element name="VOUT" library="evmik_testpads" package="13" value="TP-13" x="91.44" y="24.13"/>
+<element name="INBUF" library="evmik_opamp" package="DIP8" value="" x="17.78" y="22.86" smashed="yes" rot="R270">
+<attribute name="NAME" x="14.986" y="28.829" size="1.27" layer="25" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="17.145" y="26.416" size="1.27" layer="27" ratio="10" rot="R270"/>
+</element>
+<element name="C4" library="evmik_rcl" package="0805" value="22u" x="26.67" y="21.59"/>
+<element name="R9" library="evmik_rcl" package="1206" value="1k" x="33.02" y="20.32" rot="R270"/>
+<element name="R10" library="evmik_rcl" package="1206" value="100k" x="82.55" y="49.53"/>
+<element name="R11" library="evmik_rcl" package="1206" value="100k" x="73.66" y="49.53" smashed="yes">
+<attribute name="NAME" x="73.66" y="50.927" size="1.016" layer="25" font="vector"/>
+<attribute name="VALUE" x="72.39" y="46.99" size="1.27" layer="27"/>
+</element>
+<element name="C5" library="evmik_rcl" package="0805" value="70uF" x="83.82" y="43.18" smashed="yes" rot="R270">
+<attribute name="NAME" x="81.407" y="44.45" size="1.016" layer="25" font="vector" rot="R270"/>
+<attribute name="VALUE" x="81.28" y="44.45" size="1.27" layer="27" rot="R270"/>
+</element>
+<element name="C6" library="evmik_rcl" package="0805" value="70uF" x="74.93" y="43.18" smashed="yes" rot="R270">
+<attribute name="NAME" x="72.517" y="44.45" size="1.016" layer="25" font="vector" rot="R270"/>
+<attribute name="VALUE" x="72.39" y="44.45" size="1.27" layer="27" rot="R270"/>
+</element>
+<element name="SWITCH" library="evmik_switches" package="3PIN" value="OFF_BOARD" x="38.1" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="30.734" y="8.255" size="1.27" layer="25" rot="R270"/>
+<attribute name="VALUE" x="30.226" y="10.795" size="1.27" layer="27" rot="R270"/>
+</element>
+<element name="VGAIN" library="evmik_trimmers" package="3386F" value="" x="22.86" y="50.8" smashed="yes">
+<attribute name="NAME" x="26.67" y="57.15" size="1.27" layer="25" rot="R180"/>
+<attribute name="VALUE" x="27.94" y="46.99" size="1.27" layer="27" rot="R90"/>
+</element>
+<element name="VPHASE" library="evmik_trimmers" package="3PIN" value="OFFBOARD_3PIN" x="41.91" y="34.29" smashed="yes" rot="R180">
+<attribute name="NAME" x="40.64" y="29.21" size="1.27" layer="25"/>
+<attribute name="VALUE" x="36.83" y="38.1" size="1.27" layer="27" rot="R270"/>
+</element>
+<element name="+15V" library="evmik_testpads" package="13" value="TP-13" x="13.97" y="66.04"/>
+<element name="-15V" library="evmik_testpads" package="13" value="TP-13" x="6.35" y="66.04"/>
+<element name="C3" library="evmik_rcl" package="0805" value="15p" x="57.15" y="39.37"/>
+<element name="INVERTER" library="evmik_testpads" package="13" value="TP-13" x="69.85" y="24.13" smashed="yes">
+<attribute name="NAME" x="65.024" y="20.32" size="1.27" layer="25" ratio="10"/>
+<attribute name="VALUE" x="69.85" y="24.13" size="0.0254" layer="27"/>
+</element>
+<element name="R8" library="evmik_rcl" package="1206" value="1k" x="50.8" y="58.42" rot="R90"/>
+<element name="R12" library="evmik_rcl" package="1206" value="1k" x="52.07" y="74.93" smashed="yes">
+<attribute name="NAME" x="49.53" y="76.327" size="1.016" layer="25" font="vector"/>
+<attribute name="VALUE" x="50.8" y="72.39" size="1.27" layer="27"/>
+</element>
+<element name="REFV" library="evmik_testpads" package="13" value="TP-13" x="50.8" y="66.04" smashed="yes">
+<attribute name="NAME" x="49.53" y="65.024" size="1.27" layer="25" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="50.8" y="66.04" size="0.0254" layer="27"/>
+</element>
+<element name="U$2" library="evmik_mounting_holes" package="0.167DRILL" value="" x="95.25" y="74.93"/>
+<element name="U$3" library="evmik_mounting_holes" package="0.167DRILL" value="" x="95.25" y="5.08"/>
+<element name="U$4" library="evmik_mounting_holes" package="0.167DRILL" value="" x="5.08" y="5.08"/>
+<element name="U$5" library="evmik_mounting_holes" package="0.167DRILL" value="" x="5.08" y="74.93"/>
+<element name="C7" library="evmik_rcl" package="POL1206" value="" x="12.7" y="54.61" rot="R180"/>
+<element name="C8" library="evmik_rcl" package="POL1206" value="" x="6.35" y="54.61" rot="R180"/>
+<element name="C9" library="evmik_rcl" package="0805" value="" x="12.7" y="49.53" rot="R180"/>
+<element name="C10" library="evmik_rcl" package="0805" value="" x="6.35" y="49.53" rot="R180"/>
 </elements>
 <signals>
 <signal name="N$6">
 <contactref element="INGN" pad="2"/>
 <contactref element="R5" pad="2"/>
 <contactref element="VGAIN" pad="1"/>
-<wire x1="30.48" y1="26.67" x2="83.82" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="30.48" y1="35.712" x2="30.48" y2="26.67" width="0" layer="19" extent="1-1"/>
+<wire x1="20.32" y1="50.8" x2="13.97" y2="44.45" width="0.635" layer="1"/>
+<wire x1="20.32" y1="53.34" x2="20.32" y2="50.8" width="0.635" layer="1"/>
+<wire x1="13.97" y1="44.45" x2="13.97" y2="44.602" width="0.635" layer="1"/>
+<wire x1="20.32" y1="40.64" x2="17.78" y2="40.64" width="0.635" layer="1"/>
+<wire x1="20.32" y1="50.8" x2="20.32" y2="40.64" width="0.635" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="R2" pad="2"/>
@@ -530,29 +683,63 @@ design rules under a new name.</description>
 <contactref element="PHASE" pad="TP"/>
 <contactref element="U$1" pad="RA"/>
 <contactref element="U$1" pad="RINA"/>
-<wire x1="69.85" y1="60.96" x2="73.66" y2="71.12" width="0" layer="19" extent="1-1"/>
-<wire x1="62.23" y1="71.12" x2="73.66" y2="71.12" width="0" layer="19" extent="1-1"/>
-<wire x1="64.922" y1="41.91" x2="69.85" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="17.78" y1="36.83" x2="64.922" y2="41.91" width="0" layer="19" extent="1-1"/>
+<wire x1="48.26" y1="50.8" x2="44.45" y2="50.8" width="0.635" layer="1"/>
+<wire x1="53.34" y1="67.31" x2="58.42" y2="67.31" width="0.635" layer="1"/>
+<wire x1="53.34" y1="55.88" x2="53.34" y2="67.31" width="0.635" layer="1"/>
+<wire x1="48.26" y1="50.8" x2="53.34" y2="55.88" width="0.635" layer="1"/>
+<wire x1="45.72" y1="60.96" x2="42.062" y2="60.96" width="0.635" layer="1"/>
+<wire x1="45.72" y1="59.69" x2="45.72" y2="60.96" width="0.635" layer="1"/>
+<wire x1="48.26" y1="57.15" x2="45.72" y2="59.69" width="0.635" layer="16"/>
+<wire x1="48.26" y1="50.8" x2="48.26" y2="57.15" width="0.635" layer="16"/>
+<wire x1="41.91" y1="60.96" x2="42.062" y2="60.96" width="0.635" layer="1"/>
+<via x="45.72" y="59.69" extent="1-16" drill="0.6096"/>
+<wire x1="60.96" y1="57.15" x2="66.04" y2="57.15" width="0.635" layer="1"/>
+<wire x1="60.96" y1="66.04" x2="60.96" y2="57.15" width="0.635" layer="1"/>
+<wire x1="59.69" y1="67.31" x2="60.96" y2="66.04" width="0.635" layer="1"/>
+<wire x1="58.42" y1="67.31" x2="59.69" y2="67.31" width="0.635" layer="1"/>
 </signal>
 <signal name="-15V">
 <contactref element="-15V" pad="TP"/>
-<contactref element="15_EXT2" pad="3"/>
+<contactref element="POWER_OUT" pad="3"/>
 <contactref element="INGN" pad="4"/>
 <contactref element="U$1" pad="-VS"/>
 <contactref element="OUT" pad="4"/>
 <contactref element="INVT" pad="4"/>
 <contactref element="ALPS" pad="4"/>
 <contactref element="INBUF" pad="4"/>
-<contactref element="15V_EXT1" pad="3"/>
-<wire x1="62.23" y1="53.34" x2="73.66" y2="64.77" width="0" layer="19" extent="1-1"/>
-<wire x1="40.64" y1="49.53" x2="62.23" y2="53.34" width="0" layer="19" extent="1-1"/>
-<wire x1="22.86" y1="54.61" x2="40.64" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="7.62" y1="52.07" x2="22.86" y2="54.61" width="0" layer="19" extent="1-1"/>
-<wire x1="7.62" y1="60.96" x2="7.62" y2="52.07" width="0" layer="19" extent="1-1"/>
-<wire x1="10.16" y1="34.29" x2="22.86" y2="54.61" width="0" layer="19" extent="1-1"/>
-<wire x1="10.16" y1="21.59" x2="10.16" y2="34.29" width="0" layer="19" extent="1-1"/>
-<wire x1="30.48" y1="21.59" x2="10.16" y2="21.59" width="0" layer="19" extent="1-1"/>
+<contactref element="POWER_IN" pad="3"/>
+<wire x1="58.42" y1="16.51" x2="53.34" y2="21.59" width="0.635" layer="1"/>
+<wire x1="78.74" y1="16.51" x2="58.42" y2="16.51" width="0.635" layer="1"/>
+<wire x1="78.74" y1="21.59" x2="78.74" y2="20.32" width="0.635" layer="1"/>
+<wire x1="78.74" y1="20.32" x2="78.74" y2="16.51" width="0.635" layer="1"/>
+<wire x1="63.5" y1="49.53" x2="58.42" y2="49.53" width="0.635" layer="1"/>
+<wire x1="63.5" y1="35.56" x2="63.5" y2="49.53" width="0.635" layer="1"/>
+<wire x1="78.74" y1="20.32" x2="63.5" y2="35.56" width="0.635" layer="1"/>
+<wire x1="16.51" y1="19.05" x2="13.97" y2="19.05" width="0.635" layer="16"/>
+<wire x1="17.78" y1="20.32" x2="16.51" y2="19.05" width="0.635" layer="16"/>
+<wire x1="17.78" y1="35.56" x2="17.78" y2="20.32" width="0.635" layer="16"/>
+<wire x1="36.83" y1="38.1" x2="36.83" y2="48.26" width="0.635" layer="1"/>
+<wire x1="31.75" y1="33.02" x2="36.83" y2="38.1" width="0.635" layer="1"/>
+<wire x1="17.78" y1="33.02" x2="31.75" y2="33.02" width="0.635" layer="1"/>
+<wire x1="17.78" y1="35.56" x2="17.78" y2="34.29" width="0.635" layer="1"/>
+<wire x1="17.78" y1="34.29" x2="17.78" y2="33.02" width="0.635" layer="1"/>
+<wire x1="52.07" y1="49.53" x2="58.42" y2="49.53" width="0.635" layer="16"/>
+<wire x1="46.99" y1="44.45" x2="52.07" y2="49.53" width="0.635" layer="16"/>
+<wire x1="40.64" y1="44.45" x2="46.99" y2="44.45" width="0.635" layer="16"/>
+<wire x1="36.83" y1="48.26" x2="40.64" y2="44.45" width="0.635" layer="16"/>
+<contactref element="C8" pad="-"/>
+<contactref element="C10" pad="2"/>
+<wire x1="6.35" y1="66.04" x2="6.35" y2="60.96" width="0.635" layer="1"/>
+<wire x1="5.08" y1="54.61" x2="5.08" y2="49.53" width="0.635" layer="1"/>
+<wire x1="5.08" y1="39.37" x2="6.35" y2="38.1" width="0.635" layer="1"/>
+<wire x1="5.08" y1="49.53" x2="5.08" y2="39.37" width="0.635" layer="1"/>
+<wire x1="5.08" y1="49.53" x2="5.4" y2="49.53" width="0.635" layer="1"/>
+<wire x1="5.08" y1="59.69" x2="6.35" y2="60.96" width="0.635" layer="1"/>
+<wire x1="5.08" y1="54.61" x2="5.08" y2="59.69" width="0.635" layer="1"/>
+<wire x1="5.08" y1="54.61" x2="4.928" y2="54.61" width="0.635" layer="1"/>
+<wire x1="6.35" y1="35.56" x2="6.35" y2="38.1" width="0.635" layer="1"/>
+<wire x1="7.62" y1="34.29" x2="6.35" y2="35.56" width="0.635" layer="1"/>
+<wire x1="17.78" y1="34.29" x2="7.62" y2="34.29" width="0.635" layer="1"/>
 </signal>
 <signal name="GND">
 <contactref element="R5" pad="1"/>
@@ -560,154 +747,257 @@ design rules under a new name.</description>
 <contactref element="U$1" pad="RB"/>
 <contactref element="GND" pad="TP"/>
 <contactref element="C2" pad="2"/>
-<contactref element="C6" pad="2"/>
-<contactref element="C5" pad="2"/>
-<contactref element="OUTPUT" pad="SHIELD"/>
-<contactref element="INPUT" pad="SHIELD"/>
-<contactref element="REFERENCE" pad="SHIELD"/>
+<contactref element="OUTPUT" pad="SHIELD2"/>
+<contactref element="INPUT" pad="SHIELD2"/>
+<contactref element="REFERENCE" pad="SHIELD2"/>
 <contactref element="R9" pad="2"/>
-<contactref element="15_EXT2" pad="2"/>
-<contactref element="15V_EXT1" pad="2"/>
+<contactref element="POWER_OUT" pad="2"/>
+<contactref element="POWER_IN" pad="2"/>
 <contactref element="SWITCH" pad="1"/>
 <contactref element="R6" pad="1"/>
 <contactref element="R12" pad="2"/>
-<polygon width="0.6096" layer="16">
+<polygon width="0.635" layer="16" isolate="0.4064">
 <vertex x="1.27" y="78.74"/>
 <vertex x="99.06" y="78.74"/>
 <vertex x="99.06" y="1.27"/>
 <vertex x="1.27" y="1.27"/>
 </polygon>
-<wire x1="69.85" y1="55.88" x2="69.85" y2="63.5" width="0" layer="19" extent="1-1"/>
-<wire x1="58.42" y1="64.77" x2="69.85" y2="63.5" width="0" layer="19" extent="1-1"/>
-<wire x1="78.892" y1="48.26" x2="69.85" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="50.952" y1="35.56" x2="69.85" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="44.602" y1="35.56" x2="50.952" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="38.252" y1="35.56" x2="44.602" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="36.678" y1="41.91" x2="38.252" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="30.48" y1="32.868" x2="38.252" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="25.4" y1="16.358" x2="30.48" y2="32.868" width="0" layer="19" extent="1-1"/>
-<wire x1="24.13" y1="12.7" x2="25.4" y2="16.358" width="0" layer="19" extent="1-1"/>
-<wire x1="42.799" y1="13.97" x2="25.4" y2="16.358" width="0" layer="19" extent="1-1"/>
-<wire x1="55.88" y1="12.7" x2="42.799" y2="13.97" width="0" layer="19" extent="1-1"/>
-<wire x1="83.82" y1="12.7" x2="55.88" y2="12.7" width="0" layer="19" extent="1-1"/>
-<wire x1="10.16" y1="52.07" x2="36.678" y2="41.91" width="0" layer="19" extent="1-1"/>
-<wire x1="10.16" y1="60.96" x2="10.16" y2="52.07" width="0" layer="19" extent="1-1"/>
+<wire x1="39.37" y1="19.05" x2="33.02" y2="19.05" width="0.635" layer="1"/>
+<wire x1="39.37" y1="19.05" x2="39.37" y2="18.898" width="0.635" layer="1"/>
+<contactref element="OUTPUT" pad="SHIELD1"/>
+<contactref element="REFERENCE" pad="SHIELD1"/>
+<contactref element="INPUT" pad="SHIELD1"/>
+<contactref element="C6" pad="2"/>
+<contactref element="C5" pad="2"/>
+<wire x1="24.13" y1="19.05" x2="33.02" y2="19.05" width="0.635" layer="1"/>
+<wire x1="24.13" y1="12.7" x2="24.13" y2="19.05" width="0.635" layer="1"/>
+<wire x1="33.02" y1="19.05" x2="33.02" y2="18.898" width="0.635" layer="1"/>
+<contactref element="C7" pad="-"/>
+<contactref element="C8" pad="+"/>
+<contactref element="C10" pad="1"/>
+<contactref element="C9" pad="2"/>
+<wire x1="11.278" y1="54.61" x2="8.89" y2="54.61" width="0.635" layer="1"/>
+<wire x1="8.89" y1="54.61" x2="7.772" y2="54.61" width="0.635" layer="1"/>
+<wire x1="11.43" y1="54.61" x2="11.278" y2="54.61" width="0.635" layer="1"/>
+<wire x1="11.75" y1="49.53" x2="7.62" y2="49.53" width="0.635" layer="1"/>
+<wire x1="7.62" y1="49.53" x2="7.62" y2="54.61" width="0.635" layer="1"/>
+<wire x1="7.62" y1="54.61" x2="7.772" y2="54.61" width="0.635" layer="1"/>
+<wire x1="7.62" y1="49.53" x2="7.3" y2="49.53" width="0.635" layer="1"/>
+<wire x1="8.89" y1="60.96" x2="8.89" y2="54.61" width="0.635" layer="1"/>
+<wire x1="13.97" y1="36.83" x2="13.97" y2="41.758" width="0.635" layer="1"/>
+<wire x1="12.7" y1="35.56" x2="13.97" y2="36.83" width="0.635" layer="1"/>
+<wire x1="8.89" y1="35.56" x2="12.7" y2="35.56" width="0.635" layer="1"/>
+<wire x1="8.89" y1="38.1" x2="8.89" y2="35.56" width="0.635" layer="1"/>
+<wire x1="13.97" y1="41.91" x2="13.97" y2="41.758" width="0.635" layer="1"/>
+<wire x1="83.82" y1="41.91" x2="80.01" y2="41.91" width="0.635" layer="1"/>
+<wire x1="80.01" y1="41.91" x2="74.93" y2="41.91" width="0.635" layer="1"/>
+<wire x1="74.93" y1="41.91" x2="74.93" y2="42.23" width="0.635" layer="1"/>
+<wire x1="83.82" y1="41.91" x2="91.44" y2="41.91" width="0.635" layer="1"/>
+<wire x1="91.44" y1="41.91" x2="91.44" y2="42.23" width="0.635" layer="1"/>
+<wire x1="83.82" y1="41.91" x2="83.82" y2="42.23" width="0.635" layer="1"/>
+<via x="80.01" y="41.91" extent="1-16" drill="0.6096"/>
+<wire x1="64.77" y1="59.69" x2="63.5" y2="60.96" width="0.635" layer="1"/>
+<wire x1="53.34" y1="74.93" x2="53.492" y2="74.93" width="0.635" layer="1"/>
+<wire x1="66.04" y1="59.69" x2="64.77" y2="59.69" width="0.635" layer="1"/>
+<wire x1="63.5" y1="60.96" x2="63.5" y2="71.12" width="0.6096" layer="1"/>
+<wire x1="63.5" y1="71.12" x2="59.69" y2="74.93" width="0.6096" layer="1"/>
+<wire x1="59.69" y1="74.93" x2="53.492" y2="74.93" width="0.6096" layer="1"/>
 </signal>
 <signal name="+15V">
 <contactref element="INGN" pad="7"/>
 <contactref element="ALPS" pad="7"/>
 <contactref element="U$1" pad="+VS"/>
 <contactref element="+15V" pad="TP"/>
-<contactref element="15_EXT2" pad="1"/>
+<contactref element="POWER_OUT" pad="1"/>
 <contactref element="OUT" pad="7"/>
 <contactref element="INVT" pad="7"/>
 <contactref element="INBUF" pad="7"/>
-<contactref element="15V_EXT1" pad="1"/>
+<contactref element="POWER_IN" pad="1"/>
 <contactref element="R8" pad="1"/>
-<wire x1="69.85" y1="48.26" x2="88.9" y2="64.77" width="0" layer="19" extent="1-1"/>
-<wire x1="48.26" y1="54.61" x2="69.85" y2="48.26" width="0" layer="19" extent="1-1"/>
-<wire x1="30.48" y1="59.69" x2="48.26" y2="54.61" width="0" layer="19" extent="1-1"/>
-<wire x1="12.7" y1="52.07" x2="30.48" y2="59.69" width="0" layer="19" extent="1-1"/>
-<wire x1="12.7" y1="60.96" x2="12.7" y2="52.07" width="0" layer="19" extent="1-1"/>
-<wire x1="17.628" y1="45.72" x2="12.7" y2="52.07" width="0" layer="19" extent="1-1"/>
-<wire x1="17.78" y1="39.37" x2="17.628" y2="45.72" width="0" layer="19" extent="1-1"/>
-<wire x1="17.78" y1="26.67" x2="17.78" y2="39.37" width="0" layer="19" extent="1-1"/>
-<wire x1="38.1" y1="26.67" x2="17.78" y2="26.67" width="0" layer="19" extent="1-1"/>
+<wire x1="27.94" y1="40.64" x2="25.4" y2="40.64" width="0.635" layer="1"/>
+<wire x1="27.94" y1="44.45" x2="27.94" y2="40.64" width="0.635" layer="1"/>
+<wire x1="82.55" y1="26.67" x2="86.36" y2="26.67" width="0.635" layer="1"/>
+<wire x1="82.55" y1="29.21" x2="82.55" y2="26.67" width="0.635" layer="1"/>
+<wire x1="67.31" y1="44.45" x2="82.55" y2="29.21" width="0.635" layer="1"/>
+<wire x1="66.04" y1="44.45" x2="67.31" y2="44.45" width="0.635" layer="1"/>
+<wire x1="63.5" y1="26.67" x2="60.96" y2="26.67" width="0.635" layer="16"/>
+<wire x1="66.04" y1="29.21" x2="63.5" y2="26.67" width="0.635" layer="16"/>
+<wire x1="66.04" y1="44.45" x2="66.04" y2="40.64" width="0.635" layer="16"/>
+<wire x1="66.04" y1="40.64" x2="66.04" y2="29.21" width="0.635" layer="16"/>
+<wire x1="25.4" y1="24.13" x2="21.59" y2="24.13" width="0.635" layer="1"/>
+<wire x1="41.91" y1="40.64" x2="40.64" y2="39.37" width="0.635" layer="1"/>
+<wire x1="40.64" y1="39.37" x2="25.4" y2="24.13" width="0.635" layer="1"/>
+<wire x1="41.91" y1="52.07" x2="41.91" y2="40.64" width="0.635" layer="1"/>
+<wire x1="43.18" y1="53.34" x2="41.91" y2="52.07" width="0.635" layer="1"/>
+<wire x1="44.45" y1="53.34" x2="43.18" y2="53.34" width="0.635" layer="1"/>
+<wire x1="53.34" y1="40.64" x2="66.04" y2="40.64" width="0.635" layer="16"/>
+<wire x1="41.91" y1="40.64" x2="53.34" y2="40.64" width="0.635" layer="1"/>
+<via x="53.34" y="40.64" extent="1-16" drill="0.6096"/>
+<wire x1="39.37" y1="40.64" x2="25.4" y2="40.64" width="0.635" layer="16"/>
+<wire x1="40.64" y1="39.37" x2="39.37" y2="40.64" width="0.635" layer="1"/>
+<wire x1="41.91" y1="53.34" x2="44.45" y2="53.34" width="0.635" layer="16"/>
+<wire x1="40.64" y1="54.61" x2="41.91" y2="53.34" width="0.635" layer="16"/>
+<wire x1="40.64" y1="60.96" x2="40.64" y2="54.61" width="0.635" layer="16"/>
+<wire x1="11.43" y1="60.96" x2="40.64" y2="60.96" width="0.635" layer="16"/>
+<via x="39.37" y="40.64" extent="1-16" drill="0.6096"/>
+<wire x1="46.99" y1="53.34" x2="50.8" y2="57.15" width="0.635" layer="1"/>
+<wire x1="44.45" y1="53.34" x2="46.99" y2="53.34" width="0.635" layer="1"/>
+<wire x1="50.8" y1="57.15" x2="50.8" y2="56.998" width="0.635" layer="1"/>
+<contactref element="C7" pad="+"/>
+<contactref element="C9" pad="1"/>
+<wire x1="11.43" y1="63.5" x2="13.97" y2="66.04" width="0.635" layer="1"/>
+<wire x1="11.43" y1="60.96" x2="11.43" y2="63.5" width="0.635" layer="1"/>
+<wire x1="13.97" y1="54.61" x2="13.97" y2="49.53" width="0.635" layer="1"/>
+<wire x1="13.97" y1="58.42" x2="11.43" y2="60.96" width="0.635" layer="1"/>
+<wire x1="13.97" y1="54.61" x2="13.97" y2="58.42" width="0.635" layer="1"/>
+<wire x1="13.97" y1="54.61" x2="14.122" y2="54.61" width="0.635" layer="1"/>
+<wire x1="11.43" y1="45.72" x2="11.43" y2="38.1" width="0.635" layer="1"/>
+<wire x1="13.97" y1="48.26" x2="11.43" y2="45.72" width="0.635" layer="1"/>
+<wire x1="13.97" y1="49.53" x2="13.97" y2="48.26" width="0.635" layer="1"/>
+<wire x1="13.97" y1="49.53" x2="13.65" y2="49.53" width="0.635" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="RF"/>
 <contactref element="U$1" pad="CHB-"/>
 <contactref element="U$1" pad="CHA-"/>
-<wire x1="69.85" y1="68.58" x2="69.85" y2="71.12" width="0" layer="19" extent="1-1"/>
-<wire x1="69.85" y1="58.42" x2="69.85" y2="68.58" width="0" layer="19" extent="1-1"/>
+<wire x1="68.58" y1="54.61" x2="66.04" y2="54.61" width="0.635" layer="1"/>
+<wire x1="68.58" y1="66.04" x2="68.58" y2="54.61" width="0.635" layer="1"/>
+<wire x1="66.04" y1="67.31" x2="67.31" y2="66.04" width="0.635" layer="1"/>
+<wire x1="67.31" y1="66.04" x2="68.58" y2="66.04" width="0.635" layer="1"/>
+<wire x1="67.31" y1="66.04" x2="66.04" y2="64.77" width="0.635" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="U$1" pad="VOUT"/>
 <contactref element="LIOUT" pad="TP"/>
 <contactref element="R11" pad="1"/>
-<wire x1="69.85" y1="53.34" x2="88.9" y2="71.12" width="0" layer="19" extent="1-1"/>
-<wire x1="87.478" y1="41.91" x2="69.85" y2="53.34" width="0" layer="19" extent="1-1"/>
+<wire x1="72.39" y1="54.61" x2="72.39" y2="49.53" width="0.635" layer="1"/>
+<wire x1="72.238" y1="49.53" x2="66.04" y2="49.53" width="0.635" layer="1"/>
+<wire x1="72.39" y1="49.53" x2="72.238" y2="49.53" width="0.635" layer="1"/>
 </signal>
 <signal name="N$8">
 <contactref element="R1" pad="2"/>
 <contactref element="OUT" pad="3"/>
 <contactref element="C2" pad="1"/>
-<wire x1="24.282" y1="35.56" x2="48.108" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="22.86" y1="57.15" x2="24.282" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="91.44" y1="49.53" x2="91.44" y2="46.99" width="0.635" layer="1"/>
+<wire x1="91.44" y1="46.99" x2="91.44" y2="44.13" width="0.635" layer="1"/>
+<wire x1="91.44" y1="44.45" x2="91.44" y2="44.13" width="0.635" layer="1"/>
+<wire x1="91.44" y1="49.53" x2="91.592" y2="49.53" width="0.635" layer="1"/>
+<wire x1="81.28" y1="24.13" x2="78.74" y2="24.13" width="0.635" layer="16"/>
+<wire x1="82.55" y1="31.75" x2="82.55" y2="25.4" width="0.635" layer="16"/>
+<wire x1="82.55" y1="25.4" x2="81.28" y2="24.13" width="0.635" layer="16"/>
+<wire x1="93.98" y1="39.37" x2="82.55" y2="31.75" width="0.635" layer="1"/>
+<wire x1="93.98" y1="46.99" x2="93.98" y2="39.37" width="0.635" layer="1"/>
+<wire x1="91.44" y1="46.99" x2="93.98" y2="46.99" width="0.635" layer="1"/>
+<via x="82.55" y="31.75" extent="1-16" drill="0.6096"/>
 </signal>
 <signal name="N$9">
 <contactref element="OUT" pad="6"/>
 <contactref element="OUT" pad="2"/>
 <contactref element="OUTPUT" pad="CONDUCTOR"/>
 <contactref element="VOUT" pad="TP"/>
-<wire x1="81.28" y1="12.7" x2="69.85" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="30.48" y1="57.15" x2="69.85" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="22.86" y1="59.69" x2="30.48" y2="57.15" width="0" layer="19" extent="1-1"/>
+<wire x1="81.28" y1="26.67" x2="78.74" y2="26.67" width="0.635" layer="1"/>
+<wire x1="81.28" y1="12.7" x2="81.28" y2="24.13" width="0.635" layer="1"/>
+<wire x1="81.28" y1="24.13" x2="81.28" y2="26.67" width="0.635" layer="1"/>
+<wire x1="81.28" y1="24.13" x2="86.36" y2="24.13" width="0.635" layer="1"/>
+<wire x1="86.36" y1="24.13" x2="91.44" y2="24.13" width="0.635" layer="1"/>
 </signal>
 <signal name="N$12">
 <contactref element="R4" pad="1"/>
 <contactref element="C3" pad="1"/>
 <contactref element="R3" pad="2"/>
 <contactref element="INVT" pad="2"/>
-<wire x1="58.572" y1="41.91" x2="74.778" y2="41.91" width="0" layer="19" extent="1-1"/>
-<wire x1="49.378" y1="41.91" x2="58.572" y2="41.91" width="0" layer="19" extent="1-1"/>
-<wire x1="40.64" y1="54.61" x2="49.378" y2="41.91" width="0" layer="19" extent="1-1"/>
+<wire x1="55.88" y1="39.37" x2="55.88" y2="34.29" width="0.635" layer="1"/>
+<wire x1="55.88" y1="39.37" x2="56.2" y2="39.37" width="0.635" layer="1"/>
+<wire x1="53.34" y1="26.67" x2="50.8" y2="26.67" width="0.635" layer="1"/>
+<wire x1="50.8" y1="26.67" x2="48.26" y2="26.67" width="0.635" layer="1"/>
+<wire x1="48.26" y1="26.67" x2="48.26" y2="26.822" width="0.635" layer="1"/>
+<wire x1="50.8" y1="34.29" x2="55.728" y2="34.29" width="0.635" layer="1"/>
+<wire x1="50.8" y1="26.67" x2="50.8" y2="34.29" width="0.635" layer="1"/>
+<wire x1="55.88" y1="34.29" x2="55.728" y2="34.29" width="0.635" layer="1"/>
 </signal>
 <signal name="N$7">
 <contactref element="R6" pad="2"/>
 <contactref element="VPHASE" pad="3"/>
-<wire x1="58.42" y1="21.59" x2="39.522" y2="41.91" width="0" layer="19" extent="1-1"/>
+<wire x1="39.37" y1="34.29" x2="39.37" y2="21.742" width="0.635" layer="1"/>
+<wire x1="39.37" y1="21.59" x2="39.37" y2="21.742" width="0.635" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="C1" pad="2"/>
 <contactref element="ALPS" pad="3"/>
 <contactref element="VPHASE" pad="2"/>
-<wire x1="47.142" y1="24.13" x2="60.96" y2="24.13" width="0" layer="19" extent="1-1"/>
-<wire x1="10.16" y1="36.83" x2="47.142" y2="24.13" width="0" layer="19" extent="1-1"/>
+<wire x1="34.29" y1="38.1" x2="30.48" y2="38.1" width="0.635" layer="1"/>
+<wire x1="34.29" y1="49.53" x2="34.29" y2="38.1" width="0.635" layer="1"/>
+<wire x1="35.56" y1="50.8" x2="34.29" y2="49.53" width="0.635" layer="1"/>
+<wire x1="36.83" y1="50.8" x2="35.56" y2="50.8" width="0.635" layer="1"/>
+<wire x1="30.48" y1="38.1" x2="30.48" y2="38.42" width="0.635" layer="1"/>
+<wire x1="41.91" y1="38.1" x2="41.91" y2="34.29" width="0.635" layer="16"/>
+<wire x1="34.29" y1="38.1" x2="41.91" y2="38.1" width="0.635" layer="16"/>
+<via x="34.29" y="38.1" extent="1-16" drill="0.6096"/>
 </signal>
 <signal name="N$11">
 <contactref element="REFERENCE" pad="CONDUCTOR"/>
 <contactref element="VREF" pad="TP"/>
 <contactref element="R3" pad="1"/>
 <contactref element="SWITCH" pad="3"/>
-<wire x1="54.61" y1="35.56" x2="55.728" y2="41.91" width="0" layer="19" extent="1-1"/>
-<wire x1="53.34" y1="12.7" x2="54.61" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="33.401" y1="13.97" x2="53.34" y2="12.7" width="0" layer="19" extent="1-1"/>
+<wire x1="48.26" y1="17.78" x2="48.26" y2="19.05" width="0.635" layer="1"/>
+<wire x1="48.26" y1="19.05" x2="48.26" y2="23.978" width="0.635" layer="1"/>
+<wire x1="48.26" y1="24.13" x2="48.26" y2="23.978" width="0.635" layer="1"/>
+<wire x1="48.26" y1="17.78" x2="53.34" y2="12.7" width="0.635" layer="1"/>
+<wire x1="35.56" y1="6.35" x2="35.56" y2="5.08" width="0.635" layer="1"/>
+<wire x1="48.26" y1="19.05" x2="35.56" y2="6.35" width="0.635" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="INBUF" pad="2"/>
 <contactref element="INBUF" pad="6"/>
 <contactref element="C4" pad="1"/>
-<wire x1="17.78" y1="24.13" x2="22.708" y2="24.13" width="0" layer="19" extent="1-1"/>
-<wire x1="10.16" y1="26.67" x2="17.78" y2="24.13" width="0" layer="19" extent="1-1"/>
+<wire x1="21.59" y1="21.59" x2="25.72" y2="21.59" width="0.635" layer="1"/>
+<wire x1="25.4" y1="21.59" x2="25.72" y2="21.59" width="0.635" layer="1"/>
+<wire x1="19.05" y1="24.13" x2="13.97" y2="24.13" width="0.635" layer="1"/>
+<wire x1="19.05" y1="22.86" x2="19.05" y2="24.13" width="0.635" layer="1"/>
+<wire x1="20.32" y1="21.59" x2="19.05" y2="22.86" width="0.635" layer="1"/>
+<wire x1="21.59" y1="21.59" x2="20.32" y2="21.59" width="0.635" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="INPUT" pad="CONDUCTOR"/>
 <contactref element="VIN" pad="TP"/>
 <contactref element="INBUF" pad="3"/>
-<wire x1="21.59" y1="12.7" x2="85.09" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="10.16" y1="24.13" x2="21.59" y2="12.7" width="0" layer="19" extent="1-1"/>
+<wire x1="8.89" y1="21.59" x2="11.43" y2="21.59" width="0.635" layer="1"/>
+<wire x1="11.43" y1="21.59" x2="13.97" y2="21.59" width="0.635" layer="1"/>
+<wire x1="17.78" y1="16.51" x2="21.59" y2="12.7" width="0.635" layer="1"/>
+<wire x1="11.43" y1="16.51" x2="17.78" y2="16.51" width="0.635" layer="1"/>
+<wire x1="11.43" y1="21.59" x2="11.43" y2="16.51" width="0.635" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="C4" pad="2"/>
 <contactref element="INGN" pad="3"/>
 <contactref element="R9" pad="1"/>
-<wire x1="25.552" y1="24.13" x2="30.48" y2="24.13" width="0" layer="19" extent="1-1"/>
-<wire x1="25.4" y1="19.202" x2="25.552" y2="24.13" width="0" layer="19" extent="1-1"/>
+<wire x1="33.02" y1="21.59" x2="27.62" y2="21.59" width="0.635" layer="1"/>
+<wire x1="33.02" y1="21.59" x2="33.02" y2="21.742" width="0.635" layer="1"/>
+<wire x1="20.32" y1="38.1" x2="17.78" y2="38.1" width="0.635" layer="16"/>
+<wire x1="27.94" y1="24.13" x2="20.32" y2="38.1" width="0.635" layer="16"/>
+<wire x1="27.94" y1="21.59" x2="27.94" y2="24.13" width="0.635" layer="1"/>
+<wire x1="27.94" y1="21.59" x2="27.62" y2="21.59" width="0.635" layer="1"/>
+<via x="27.94" y="24.13" extent="1-16" drill="0.6096"/>
 </signal>
 <signal name="N$19">
 <contactref element="R11" pad="2"/>
 <contactref element="R10" pad="1"/>
 <contactref element="C6" pad="1"/>
-<wire x1="90.322" y1="41.91" x2="93.828" y2="41.91" width="0" layer="19" extent="1-1"/>
-<wire x1="35.408" y1="35.56" x2="90.322" y2="41.91" width="0" layer="19" extent="1-1"/>
+<wire x1="74.93" y1="49.53" x2="74.93" y2="44.13" width="0.635" layer="1"/>
+<wire x1="74.93" y1="44.45" x2="74.93" y2="44.13" width="0.635" layer="1"/>
+<wire x1="75.082" y1="49.53" x2="81.128" y2="49.53" width="0.635" layer="1"/>
+<wire x1="81.28" y1="49.53" x2="81.128" y2="49.53" width="0.635" layer="1"/>
+<wire x1="74.93" y1="49.53" x2="75.082" y2="49.53" width="0.635" layer="1"/>
 </signal>
 <signal name="N$20">
 <contactref element="R10" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="C5" pad="1"/>
-<wire x1="41.758" y1="35.56" x2="96.672" y2="41.91" width="0" layer="19" extent="1-1"/>
-<wire x1="21.438" y1="35.56" x2="41.758" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="83.82" y1="49.53" x2="83.82" y2="44.13" width="0.635" layer="1"/>
+<wire x1="83.82" y1="44.45" x2="83.82" y2="44.13" width="0.635" layer="1"/>
+<wire x1="83.972" y1="49.53" x2="88.748" y2="49.53" width="0.635" layer="1"/>
+<wire x1="88.9" y1="49.53" x2="88.748" y2="49.53" width="0.635" layer="1"/>
+<wire x1="83.82" y1="49.53" x2="83.972" y2="49.53" width="0.635" layer="1"/>
 </signal>
 <signal name="PREAMP">
 <contactref element="VGAIN" pad="2"/>
@@ -715,22 +1005,32 @@ design rules under a new name.</description>
 <contactref element="PREAMP" pad="TP"/>
 <contactref element="C1" pad="1"/>
 <contactref element="R7" pad="1"/>
-<wire x1="44.298" y1="29.21" x2="58.42" y2="71.12" width="0" layer="19" extent="1-1"/>
-<wire x1="44.298" y1="24.13" x2="44.298" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="38.1" y1="24.13" x2="44.298" y2="24.13" width="0" layer="19" extent="1-1"/>
-<wire x1="86.36" y1="26.67" x2="44.298" y2="29.21" width="0" layer="19" extent="1-1"/>
+<wire x1="30.48" y1="43.18" x2="30.48" y2="40.32" width="0.635" layer="1"/>
+<wire x1="30.48" y1="43.18" x2="30.48" y2="46.99" width="0.635" layer="1"/>
+<wire x1="30.48" y1="46.99" x2="30.48" y2="49.378" width="0.635" layer="1"/>
+<wire x1="30.48" y1="49.53" x2="30.48" y2="49.378" width="0.635" layer="1"/>
+<wire x1="22.86" y1="38.1" x2="25.4" y2="38.1" width="0.635" layer="1"/>
+<wire x1="22.86" y1="48.26" x2="22.86" y2="46.99" width="0.635" layer="1"/>
+<wire x1="22.86" y1="46.99" x2="22.86" y2="38.1" width="0.635" layer="1"/>
+<wire x1="22.86" y1="46.99" x2="30.48" y2="46.99" width="0.635" layer="1"/>
 </signal>
 <signal name="N$4">
 <contactref element="INVT" pad="3"/>
 <contactref element="SWITCH" pad="2"/>
-<wire x1="38.1" y1="13.97" x2="40.64" y2="52.07" width="0" layer="19" extent="1-1"/>
+<wire x1="48.26" y1="24.13" x2="53.34" y2="24.13" width="0.635" layer="16"/>
+<wire x1="38.1" y1="5.08" x2="48.26" y2="24.13" width="0.635" layer="16"/>
 </signal>
 <signal name="N$10">
 <contactref element="ALPS" pad="2"/>
 <contactref element="R7" pad="2"/>
 <contactref element="R2" pad="1"/>
-<wire x1="47.142" y1="29.21" x2="62.078" y2="41.91" width="0" layer="19" extent="1-1"/>
-<wire x1="10.16" y1="39.37" x2="47.142" y2="29.21" width="0" layer="19" extent="1-1"/>
+<wire x1="34.29" y1="52.07" x2="30.48" y2="52.07" width="0.635" layer="1"/>
+<wire x1="35.56" y1="53.34" x2="34.29" y2="52.07" width="0.635" layer="1"/>
+<wire x1="36.83" y1="53.34" x2="35.56" y2="53.34" width="0.635" layer="1"/>
+<wire x1="30.48" y1="52.07" x2="30.48" y2="52.222" width="0.635" layer="1"/>
+<wire x1="34.29" y1="60.96" x2="39.218" y2="60.96" width="0.635" layer="1"/>
+<wire x1="34.29" y1="52.07" x2="34.29" y2="60.96" width="0.635" layer="1"/>
+<wire x1="39.37" y1="60.96" x2="39.218" y2="60.96" width="0.635" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="R4" pad="2"/>
@@ -738,17 +1038,29 @@ design rules under a new name.</description>
 <contactref element="C3" pad="2"/>
 <contactref element="INVERTER" pad="TP"/>
 <contactref element="U$1" pad="SELB"/>
-<wire x1="62.23" y1="50.8" x2="77.622" y2="41.91" width="0" layer="19" extent="1-1"/>
-<wire x1="52.222" y1="41.91" x2="62.23" y2="50.8" width="0" layer="19" extent="1-1"/>
-<wire x1="48.26" y1="52.07" x2="52.222" y2="41.91" width="0" layer="19" extent="1-1"/>
-<wire x1="43.18" y1="64.77" x2="48.26" y2="52.07" width="0" layer="19" extent="1-1"/>
+<wire x1="69.85" y1="24.13" x2="60.96" y2="24.13" width="0.635" layer="1"/>
+<wire x1="58.42" y1="39.37" x2="58.42" y2="34.29" width="0.635" layer="1"/>
+<wire x1="60.96" y1="46.99" x2="58.42" y2="46.99" width="0.635" layer="1"/>
+<wire x1="60.96" y1="41.91" x2="60.96" y2="46.99" width="0.635" layer="1"/>
+<wire x1="58.42" y1="39.37" x2="60.96" y2="41.91" width="0.635" layer="1"/>
+<wire x1="58.42" y1="39.37" x2="58.1" y2="39.37" width="0.635" layer="1"/>
+<wire x1="58.42" y1="24.13" x2="60.96" y2="24.13" width="0.635" layer="1"/>
+<wire x1="58.42" y1="34.29" x2="58.42" y2="24.13" width="0.635" layer="1"/>
+<wire x1="58.42" y1="34.29" x2="58.572" y2="34.29" width="0.635" layer="1"/>
 </signal>
 <signal name="SELA">
 <contactref element="R8" pad="2"/>
 <contactref element="R12" pad="1"/>
 <contactref element="REFV" pad="TP"/>
-<wire x1="43.18" y1="71.12" x2="76.048" y2="48.26" width="0" layer="19" extent="1-1"/>
-<wire x1="20.472" y1="45.72" x2="43.18" y2="71.12" width="0" layer="19" extent="1-1"/>
+<wire x1="50.8" y1="66.04" x2="50.8" y2="59.842" width="0.635" layer="1"/>
+<wire x1="50.8" y1="59.69" x2="50.8" y2="59.842" width="0.635" layer="1"/>
+<contactref element="U$1" pad="SELA"/>
+<wire x1="55.88" y1="44.45" x2="58.42" y2="44.45" width="0.635" layer="1"/>
+<wire x1="55.88" y1="60.96" x2="55.88" y2="44.45" width="0.635" layer="1"/>
+<wire x1="50.8" y1="66.04" x2="55.88" y2="60.96" width="0.635" layer="16"/>
+<via x="55.88" y="60.96" extent="1-16" drill="0.6096"/>
+<wire x1="50.8" y1="66.04" x2="50.8" y2="74.93" width="0.635" layer="1"/>
+<wire x1="50.8" y1="74.93" x2="50.648" y2="74.93" width="0.635" layer="1"/>
 </signal>
 </signals>
 </board>
diff --git a/LockInAmp_v2014/LockInAmp.pro b/LockInAmp_v2014/LockInAmp.pro
index e93f310..5248a61 100644
--- a/LockInAmp_v2014/LockInAmp.pro
+++ b/LockInAmp_v2014/LockInAmp.pro
@@ -1,25 +1,25 @@
 EAGLE AutoRouter Statistics:
 
-Job           : C:/Users/cyoun/Documents/eagle/LockInAmp_v2014/LockInAmp.brd
+Job           : C:/Users/orwolfe/Documents/eagle/LockInAmp_v2014/LockInAmp.brd
 
-Start at      : 11:59:07 (4/24/2014)
-End at        : 11:59:08 (4/24/2014)
-Elapsed time  : 00:00:01
+Start at      : 16:42:15 (6/10/2014)
+End at        : 16:42:15 (6/10/2014)
+Elapsed time  : 00:00:00
 
 Signals       :    23   RoutingGrid: 50 mil  Layers: 2
-Connections   :    79   predefined:  8 ( 0 Vias )
+Connections   :    91   predefined:  91 ( 8 Vias )
 
-Router memory :   30976
+Router memory :   31680
 
-Passname          :    Busses     Route Optimize1 Optimize2 Optimize3 Optimize4
+Passname          :     Route Optimize1 Optimize2 Optimize3 Optimize4
 
-Time per pass     :  00:00:00  00:00:00  00:00:00  00:00:01  00:00:00  00:00:00
-Number of Ripups  :         0         0         0         0         0         0
-max. Level        :         0         0         0         0         0         0
-max. Total        :         0         0         0         0         0         0
+Time per pass     :  00:00:00  00:00:00  00:00:00  00:00:00  00:00:00
+Number of Ripups  :         0         0         0         0         0
+max. Level        :         0         0         0         0         0
+max. Total        :         0         0         0         0         0
 
-Routed            :         9        71        71        71        71        71
-Vias              :         0        80        32        26        25        23
-Resolution        :    21.5 %   100.0 %   100.0 %   100.0 %   100.0 %   100.0 %
+Routed            :         0         0         0         0         0
+Vias              :         0         0         0         0         0
+Resolution        :   100.0 %   100.0 %   100.0 %   100.0 %   100.0 %
 
-Final             : 98.7% finished. Polygons may have fallen apart.
+Final             : 100.0% finished
diff --git a/LockInAmp_v2014/LockInAmp.sch b/LockInAmp_v2014/LockInAmp.sch
index e2ae333..7b56f07 100644
--- a/LockInAmp_v2014/LockInAmp.sch
+++ b/LockInAmp_v2014/LockInAmp.sch
@@ -161,42 +161,6 @@
 </library>
 <library name="evmik_opamp">
 <packages>
-<package name="SOIC8">
-<description>&lt;b&gt;Small Outline Package 8&lt;/b&gt;&lt;br&gt;
-NS Package M08A</description>
-<wire x1="2.4" y1="1.9" x2="2.4" y2="-1.4" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="-1.4" x2="2.4" y2="-1.9" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="-1.9" x2="-2.4" y2="-1.9" width="0.2032" layer="51"/>
-<wire x1="-2.4" y1="-1.9" x2="-2.4" y2="-1.4" width="0.2032" layer="51"/>
-<wire x1="-2.4" y1="-1.4" x2="-2.4" y2="1.9" width="0.2032" layer="51"/>
-<wire x1="-2.4" y1="1.9" x2="2.4" y2="1.9" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="-1.4" x2="-2.4" y2="-1.4" width="0.2032" layer="51"/>
-<wire x1="-2.286" y1="1.27" x2="2.286" y2="1.27" width="0.127" layer="21"/>
-<wire x1="2.286" y1="1.27" x2="2.286" y2="-1.27" width="0.127" layer="21"/>
-<wire x1="2.286" y1="-1.27" x2="-2.286" y2="-1.27" width="0.127" layer="21"/>
-<wire x1="-2.286" y1="-1.27" x2="-2.286" y2="-0.254" width="0.127" layer="21"/>
-<wire x1="-2.286" y1="1.27" x2="-2.286" y2="0.254" width="0.127" layer="21"/>
-<wire x1="-2.286" y1="0.254" x2="-2.286" y2="-0.254" width="0.127" layer="21" curve="-180"/>
-<circle x="-1.778" y="-0.762" radius="0.254" width="0.127" layer="21"/>
-<smd name="2" x="-0.635" y="-2.6" dx="0.6096" dy="2.2098" layer="1"/>
-<smd name="7" x="-0.635" y="2.6" dx="0.6096" dy="2.2098" layer="1"/>
-<smd name="1" x="-1.905" y="-2.6" dx="0.6096" dy="2.2098" layer="1"/>
-<smd name="3" x="0.635" y="-2.6" dx="0.6096" dy="2.2098" layer="1"/>
-<smd name="4" x="1.905" y="-2.6" dx="0.6096" dy="2.2098" layer="1"/>
-<smd name="8" x="-1.905" y="2.6" dx="0.6096" dy="2.2098" layer="1"/>
-<smd name="6" x="0.635" y="2.6" dx="0.6096" dy="2.2098" layer="1"/>
-<smd name="5" x="1.905" y="2.6" dx="0.6096" dy="2.2098" layer="1"/>
-<text x="-2.667" y="-1.905" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<text x="3.937" y="-1.905" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
-<rectangle x1="-2.15" y1="-3.1" x2="-1.66" y2="-2" layer="51"/>
-<rectangle x1="-0.88" y1="-3.1" x2="-0.39" y2="-2" layer="51"/>
-<rectangle x1="0.39" y1="-3.1" x2="0.88" y2="-2" layer="51"/>
-<rectangle x1="1.66" y1="-3.1" x2="2.15" y2="-2" layer="51"/>
-<rectangle x1="1.66" y1="2" x2="2.15" y2="3.1" layer="51"/>
-<rectangle x1="0.39" y1="2" x2="0.88" y2="3.1" layer="51"/>
-<rectangle x1="-0.88" y1="2" x2="-0.39" y2="3.1" layer="51"/>
-<rectangle x1="-2.15" y1="2" x2="-1.66" y2="3.1" layer="51"/>
-</package>
 <package name="DIP8">
 <description>&lt;b&gt;Dual In Line Package&lt;/b&gt;</description>
 <wire x1="5.08" y1="2.921" x2="-5.08" y2="2.921" width="0.1524" layer="21"/>
@@ -216,6 +180,45 @@ NS Package M08A</description>
 <text x="-5.334" y="-2.921" size="1.27" layer="25" ratio="10" rot="R90">&gt;NAME</text>
 <text x="-3.556" y="-0.635" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
 </package>
+<package name="SOIC8">
+<description>&lt;b&gt;Small Outline Package 8&lt;/b&gt;&lt;br&gt;
+NS Package M08A</description>
+<wire x1="1.9" y1="-3.035" x2="-1.9" y2="-3.035" width="0.2032" layer="51"/>
+<wire x1="-1.9" y1="-3.035" x2="-1.9" y2="1.765" width="0.2032" layer="51"/>
+<wire x1="-1.9" y1="1.765" x2="1.9" y2="1.765" width="0.2032" layer="51"/>
+<wire x1="1.9" y1="1.765" x2="1.9" y2="-3.035" width="0.2032" layer="51"/>
+<wire x1="1.27" y1="1.651" x2="1.27" y2="-2.921" width="0.127" layer="21"/>
+<wire x1="1.27" y1="-2.921" x2="-1.27" y2="-2.921" width="0.127" layer="21"/>
+<wire x1="-1.27" y1="-2.921" x2="-1.27" y2="1.651" width="0.127" layer="21"/>
+<wire x1="-1.27" y1="1.651" x2="-0.254" y2="1.651" width="0.127" layer="21"/>
+<wire x1="1.27" y1="1.651" x2="0.254" y2="1.651" width="0.127" layer="21"/>
+<wire x1="0.254" y1="1.651" x2="-0.254" y2="1.651" width="0.127" layer="21" curve="-180"/>
+<circle x="-0.762" y="1.143" radius="0.254" width="0.127" layer="21"/>
+<smd name="2" x="-2.6924" y="0" dx="0.635" dy="1.5494" layer="1" rot="R270"/>
+<smd name="7" x="2.6924" y="0" dx="0.635" dy="1.5494" layer="1" rot="R270"/>
+<smd name="1" x="-2.6924" y="1.27" dx="0.635" dy="1.5494" layer="1" rot="R270"/>
+<smd name="3" x="-2.6924" y="-1.27" dx="0.635" dy="1.5494" layer="1" rot="R270"/>
+<smd name="4" x="-2.6924" y="-2.54" dx="0.635" dy="1.5494" layer="1" rot="R270"/>
+<smd name="8" x="2.6924" y="1.27" dx="0.635" dy="1.5494" layer="1" rot="R270"/>
+<smd name="6" x="2.6924" y="-1.27" dx="0.635" dy="1.5494" layer="1" rot="R270"/>
+<smd name="5" x="2.6924" y="-2.54" dx="0.635" dy="1.5494" layer="1" rot="R270"/>
+<text x="0" y="2.159" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-3.429" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+<wire x1="-0.508" y1="1.778" x2="0" y2="1.27" width="0.127" layer="51"/>
+<wire x1="0" y1="1.27" x2="0.508" y2="1.778" width="0.127" layer="51"/>
+<rectangle x1="1.9812" y1="-0.254" x2="3.0988" y2="0.254" layer="51"/>
+<rectangle x1="1.9812" y1="1.016" x2="3.0988" y2="1.524" layer="51"/>
+<rectangle x1="1.9812" y1="-1.524" x2="3.0988" y2="-1.016" layer="51"/>
+<rectangle x1="1.9812" y1="-2.794" x2="3.0988" y2="-2.286" layer="51"/>
+<rectangle x1="-3.0988" y1="-2.794" x2="-1.9812" y2="-2.286" layer="51"/>
+<rectangle x1="-3.0988" y1="-1.524" x2="-1.9812" y2="-1.016" layer="51"/>
+<rectangle x1="-3.0988" y1="-0.254" x2="-1.9812" y2="0.254" layer="51"/>
+<rectangle x1="-3.0988" y1="1.016" x2="-1.9812" y2="1.524" layer="51"/>
+<wire x1="-3.81" y1="2.54" x2="3.81" y2="2.54" width="0.0508" layer="39"/>
+<wire x1="3.81" y1="2.54" x2="3.81" y2="-3.81" width="0.0508" layer="39"/>
+<wire x1="3.81" y1="-3.81" x2="-3.81" y2="-3.81" width="0.0508" layer="39"/>
+<wire x1="-3.81" y1="-3.81" x2="-3.81" y2="2.54" width="0.0508" layer="39"/>
+</package>
 </packages>
 <symbols>
 <symbol name="OPAMP_GENERIC">
@@ -243,8 +246,8 @@ NS Package M08A</description>
 <pin name="-IN" x="-7.62" y="2.54" visible="pad" length="short" direction="in"/>
 <pin name="OUT" x="7.62" y="0" visible="pad" length="short" direction="out" rot="R180"/>
 <pin name="OPT1" x="0" y="-7.62" visible="pad" length="short" direction="pas" rot="R90"/>
-<pin name="V+" x="-2.54" y="7.62" length="short" direction="pwr" rot="R270"/>
-<pin name="V-" x="-2.54" y="-7.62" length="short" direction="pwr" rot="R90"/>
+<pin name="V+" x="-2.54" y="7.62" length="short" direction="in" rot="R270"/>
+<pin name="V-" x="-2.54" y="-7.62" length="short" direction="in" rot="R90"/>
 </symbol>
 </symbols>
 <devicesets>
@@ -290,9 +293,51 @@ NS Package M08A</description>
 </library>
 <library name="evmik_rcl">
 <packages>
+<package name="0805">
+<wire x1="-0.41" y1="0.635" x2="0.41" y2="0.635" width="0.1524" layer="51"/>
+<wire x1="-0.41" y1="-0.635" x2="0.41" y2="-0.635" width="0.1524" layer="51"/>
+<wire x1="-1.973" y1="0.983" x2="1.973" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="1.973" y1="0.983" x2="1.973" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="1.973" y1="-0.983" x2="-1.973" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="-1.973" y1="-0.983" x2="-1.973" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="-0.635" y1="1.27" x2="-1.905" y2="1.27" width="0.127" layer="21"/>
+<wire x1="-1.905" y1="1.27" x2="-1.905" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="-1.905" y1="-1.27" x2="-0.635" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-1.27" x2="1.905" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="1.905" y1="-1.27" x2="1.905" y2="1.27" width="0.127" layer="21"/>
+<wire x1="1.905" y1="1.27" x2="0.635" y2="1.27" width="0.127" layer="21"/>
+<smd name="1" x="-0.95" y="0" dx="1.3" dy="1.5" layer="1"/>
+<smd name="2" x="0.95" y="0" dx="1.3" dy="1.5" layer="1"/>
+<text x="0" y="1.397" size="1.016" layer="25" font="vector" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-1.524" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+<rectangle x1="0.4064" y1="-0.6985" x2="1.0564" y2="0.7015" layer="51"/>
+<rectangle x1="-1.0668" y1="-0.6985" x2="-0.4168" y2="0.7015" layer="51"/>
+<rectangle x1="-0.1999" y1="-0.5001" x2="0.1999" y2="0.5001" layer="35"/>
+</package>
 <package name="1206">
 <wire x1="0.9525" y1="-0.8128" x2="-0.9652" y2="-0.8128" width="0.1524" layer="51"/>
 <wire x1="0.9525" y1="0.8128" x2="-0.9652" y2="0.8128" width="0.1524" layer="51"/>
+<wire x1="-2.473" y1="1.143" x2="2.473" y2="1.143" width="0.0508" layer="39"/>
+<wire x1="2.473" y1="1.143" x2="2.473" y2="-1.143" width="0.0508" layer="39"/>
+<wire x1="2.473" y1="-1.143" x2="-2.473" y2="-1.143" width="0.0508" layer="39"/>
+<wire x1="-2.473" y1="-1.143" x2="-2.473" y2="1.143" width="0.0508" layer="39"/>
+<wire x1="-1.27" y1="1.27" x2="-2.54" y2="1.27" width="0.127" layer="21"/>
+<wire x1="-2.54" y1="1.27" x2="-2.54" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="-2.54" y1="-1.27" x2="-1.27" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="1.27" y1="-1.27" x2="2.54" y2="-1.27" width="0.127" layer="21"/>
+<wire x1="2.54" y1="-1.27" x2="2.54" y2="1.27" width="0.127" layer="21"/>
+<wire x1="2.54" y1="1.27" x2="1.27" y2="1.27" width="0.127" layer="21"/>
+<smd name="2" x="1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
+<smd name="1" x="-1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
+<text x="0" y="1.397" size="1.016" layer="25" font="vector" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-1.524" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
+<rectangle x1="-1.6891" y1="-0.8763" x2="-0.9525" y2="0.8763" layer="51"/>
+<rectangle x1="0.9525" y1="-0.8763" x2="1.6891" y2="0.8763" layer="51"/>
+<rectangle x1="-0.3" y1="-0.7" x2="0.3" y2="0.7" layer="35"/>
+</package>
+<package name="POL1206">
+<wire x1="0.9525" y1="-0.8128" x2="-0.9652" y2="-0.8128" width="0.1524" layer="51"/>
+<wire x1="0.9525" y1="0.8128" x2="-0.9652" y2="0.8128" width="0.1524" layer="51"/>
 <wire x1="-2.473" y1="0.983" x2="2.473" y2="0.983" width="0.0508" layer="39"/>
 <wire x1="2.473" y1="0.983" x2="2.473" y2="-0.983" width="0.0508" layer="39"/>
 <wire x1="2.473" y1="-0.983" x2="-2.473" y2="-0.983" width="0.0508" layer="39"/>
@@ -303,10 +348,12 @@ NS Package M08A</description>
 <wire x1="1.27" y1="-1.27" x2="2.54" y2="-1.27" width="0.127" layer="21"/>
 <wire x1="2.54" y1="-1.27" x2="2.54" y2="1.27" width="0.127" layer="21"/>
 <wire x1="2.54" y1="1.27" x2="1.27" y2="1.27" width="0.127" layer="21"/>
-<smd name="2" x="1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
-<smd name="1" x="-1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
-<text x="-1.27" y="1.397" size="1.016" layer="25" font="vector">&gt;NAME</text>
-<text x="-1.27" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
+<wire x1="-2.032" y1="2.413" x2="-2.032" y2="1.651" width="0.127" layer="21"/>
+<wire x1="-1.651" y1="2.032" x2="-2.413" y2="2.032" width="0.127" layer="21"/>
+<smd name="-" x="1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
+<smd name="+" x="-1.422" y="0" dx="1.6" dy="1.803" layer="1"/>
+<text x="0" y="1.524" size="1.016" layer="25" font="vector" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-1.524" size="1.27" layer="27" align="top-center">&gt;VALUE</text>
 <rectangle x1="-1.6891" y1="-0.8763" x2="-0.9525" y2="0.8763" layer="51"/>
 <rectangle x1="0.9525" y1="-0.8763" x2="1.6891" y2="0.8763" layer="51"/>
 <rectangle x1="-0.3" y1="-0.7" x2="0.3" y2="0.7" layer="35"/>
@@ -323,20 +370,35 @@ NS Package M08A</description>
 <wire x1="1.016" y1="-1.016" x2="1.651" y2="1.016" width="0.2032" layer="94"/>
 <wire x1="1.651" y1="1.016" x2="2.286" y2="-1.016" width="0.2032" layer="94"/>
 <wire x1="2.286" y1="-1.016" x2="2.54" y2="0" width="0.2032" layer="94"/>
-<text x="-3.81" y="1.4986" size="1.778" layer="95">&gt;NAME</text>
-<text x="-3.81" y="-3.302" size="1.778" layer="96">&gt;VALUE</text>
+<text x="0" y="2.54" size="1.778" layer="95" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-2.54" size="1.778" layer="96" align="top-center">&gt;VALUE</text>
 <pin name="2" x="5.08" y="0" visible="off" length="short" direction="pas" swaplevel="1" rot="R180"/>
 <pin name="1" x="-5.08" y="0" visible="off" length="short" direction="pas" swaplevel="1"/>
 </symbol>
 <symbol name="C-US">
-<wire x1="0" y1="0" x2="0" y2="-0.508" width="0.1524" layer="94"/>
-<wire x1="0" y1="-2.54" x2="0" y2="-2.032" width="0.1524" layer="94"/>
-<text x="1.524" y="0.381" size="1.778" layer="95">&gt;NAME</text>
-<text x="1.524" y="-4.699" size="1.778" layer="96">&gt;VALUE</text>
-<rectangle x1="-2.032" y1="-2.032" x2="2.032" y2="-1.524" layer="94"/>
-<rectangle x1="-2.032" y1="-1.016" x2="2.032" y2="-0.508" layer="94"/>
-<pin name="1" x="0" y="2.54" visible="off" length="short" direction="pas" swaplevel="1" rot="R270"/>
-<pin name="2" x="0" y="-5.08" visible="off" length="short" direction="pas" swaplevel="1" rot="R90"/>
+<wire x1="2.54" y1="0" x2="0.635" y2="0" width="0.1524" layer="94"/>
+<wire x1="-2.54" y1="0" x2="-0.635" y2="0" width="0.1524" layer="94"/>
+<text x="0" y="2.54" size="1.778" layer="95" rot="MR0" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-2.54" size="1.778" layer="96" rot="MR0" align="top-center">&gt;VALUE</text>
+<pin name="2" x="2.54" y="0" visible="off" length="point" direction="pas" swaplevel="1" rot="R180"/>
+<pin name="1" x="-2.54" y="0" visible="off" length="point" direction="pas" swaplevel="1"/>
+<wire x1="0.635" y1="1.905" x2="0.635" y2="0" width="0.254" layer="94"/>
+<wire x1="0.635" y1="0" x2="0.635" y2="-1.905" width="0.254" layer="94"/>
+<wire x1="-0.635" y1="1.905" x2="-0.635" y2="0" width="0.254" layer="94"/>
+<wire x1="-0.635" y1="0" x2="-0.635" y2="-1.905" width="0.254" layer="94"/>
+</symbol>
+<symbol name="CPOL-US">
+<wire x1="0.635" y1="1.905" x2="0.635" y2="0" width="0.254" layer="94"/>
+<wire x1="0.635" y1="0" x2="0.635" y2="-1.905" width="0.254" layer="94"/>
+<wire x1="-0.635" y1="0" x2="-2.54" y2="0" width="0.1524" layer="94"/>
+<text x="0" y="2.54" size="1.778" layer="95" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-2.54" size="1.778" layer="96" align="top-center">&gt;VALUE</text>
+<pin name="+" x="2.54" y="0" visible="off" length="point" direction="pas" rot="R180"/>
+<pin name="-" x="-2.54" y="0" visible="off" length="point" direction="pas"/>
+<wire x1="-1.27" y1="1.905" x2="-1.27" y2="-1.905" width="0.254" layer="94" curve="-75"/>
+<wire x1="2.54" y1="0" x2="0.635" y2="0" width="0.254" layer="94"/>
+<wire x1="1.905" y1="0.635" x2="1.905" y2="1.27" width="0.254" layer="94"/>
+<wire x1="1.5875" y1="0.9525" x2="2.2225" y2="0.9525" width="0.254" layer="94"/>
 </symbol>
 </symbols>
 <devicesets>
@@ -357,13 +419,13 @@ NS Package M08A</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="C1206" prefix="C" uservalue="yes">
-<description>Capacitor 1206</description>
+<deviceset name="C0805" prefix="C" uservalue="yes">
+<description>Capacitor SMD0805</description>
 <gates>
 <gate name="G$1" symbol="C-US" x="0" y="0"/>
 </gates>
 <devices>
-<device name="" package="1206">
+<device name="" package="0805">
 <connects>
 <connect gate="G$1" pin="1" pad="1"/>
 <connect gate="G$1" pin="2" pad="2"/>
@@ -374,6 +436,23 @@ NS Package M08A</description>
 </device>
 </devices>
 </deviceset>
+<deviceset name="CPOL1206" prefix="C" uservalue="yes">
+<description>Polarized capacitor SMD 1206</description>
+<gates>
+<gate name="G$1" symbol="CPOL-US" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="POL1206">
+<connects>
+<connect gate="G$1" pin="+" pad="+"/>
+<connect gate="G$1" pin="-" pad="-"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 <library name="evmik_connectors_3pin">
@@ -519,9 +598,8 @@ NS Package M08A</description>
 <package name="13">
 <circle x="0" y="0" radius="0.762" width="0.1524" layer="51"/>
 <pad name="TP" x="0" y="0" drill="1.3208" diameter="2.159" shape="octagon"/>
-<text x="-1.016" y="1.27" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="0" y="1.778" size="1.27" layer="25" ratio="10" align="bottom-center">&gt;NAME</text>
 <text x="0" y="0" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-1.27" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
 <rectangle x1="-0.3302" y1="-0.3302" x2="0.3302" y2="0.3302" layer="51"/>
 </package>
 </packages>
@@ -556,24 +634,91 @@ NS Package M08A</description>
 </library>
 <library name="evmik_trimmers">
 <packages>
-<package name="3362S">
-<pad name="2" x="0" y="-2.54" drill="0.7" diameter="1.016"/>
-<pad name="3" x="2.54" y="0" drill="0.7" diameter="1.016"/>
-<pad name="1" x="-2.54" y="0" drill="0.7" diameter="1.016"/>
-<wire x1="-3.81" y1="1.27" x2="3.81" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="3.81" y1="1.27" x2="3.81" y2="-3.81" width="0.2032" layer="21"/>
-<wire x1="-3.81" y1="-3.81" x2="-3.81" y2="1.27" width="0.2032" layer="21"/>
-<text x="-3.81" y="-3.81" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<text x="5.08" y="-3.81" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
-<wire x1="-3.81" y1="-3.81" x2="-3.175" y2="-3.81" width="0.127" layer="21"/>
-<wire x1="-3.175" y1="-3.81" x2="-3.175" y2="-3.556" width="0.127" layer="21"/>
-<wire x1="-3.175" y1="-3.556" x2="3.175" y2="-3.556" width="0.127" layer="21"/>
-<wire x1="3.175" y1="-3.556" x2="3.175" y2="-3.81" width="0.127" layer="21"/>
-<wire x1="3.175" y1="-3.81" x2="3.81" y2="-3.81" width="0.127" layer="21"/>
+<package name="3PIN">
+<wire x1="-3.81" y1="-2.54" x2="-3.81" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-3.81" y1="-2.54" x2="3.81" y2="-2.54" width="0.2032" layer="21"/>
+<wire x1="3.81" y1="3.175" x2="2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="2.54" y1="3.175" x2="-2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="3.175" x2="-3.81" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="3.81" y1="3.175" x2="3.81" y2="-2.54" 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="0" y="4.3688" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="5.9609" size="1.27" layer="27" align="bottom-center">&gt;VALUE</text>
+<text x="0" y="-4.445" size="1.27" layer="21" align="bottom-center">2</text>
+<wire x1="-2.54" y1="3.175" x2="-2.54" y2="2.54" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="2.54" x2="2.54" y2="2.54" width="0.2032" layer="21"/>
+<wire x1="2.54" y1="2.54" x2="2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-3.81" y1="3.175" x2="-3.81" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.81" y1="-2.54" x2="3.81" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.81" y1="-2.54" x2="3.81" y2="3.175" width="0.2032" layer="51"/>
+<wire x1="3.81" y1="3.175" x2="-3.81" y2="3.175" width="0.2032" layer="51"/>
+<wire x1="-4.445" y1="3.81" x2="-4.445" y2="-3.175" width="0.127" layer="39"/>
+<wire x1="-4.445" y1="-3.175" x2="4.445" y2="-3.175" width="0.127" layer="39"/>
+<wire x1="4.445" y1="-3.175" x2="4.445" y2="3.81" width="0.127" layer="39"/>
+<wire x1="4.445" y1="3.81" x2="-4.445" y2="3.81" width="0.127" layer="39"/>
+<text x="-2.54" y="-4.445" size="1.27" layer="21" align="bottom-center">1</text>
+<text x="2.54" y="-4.445" size="1.27" layer="21" align="bottom-center">3</text>
+</package>
+<package name="3386F">
+<circle x="0" y="0" radius="1.4199" width="0.2032" layer="21"/>
+<pad name="1" x="-2.54" y="2.54" drill="1"/>
+<pad name="2" x="0" y="-2.54" drill="1"/>
+<pad name="3" x="2.54" y="2.54" drill="1"/>
+<text x="0.025" y="5.475" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<rectangle x1="-1.016" y1="-0.254" x2="1.016" y2="0.254" layer="21"/>
+<rectangle x1="-0.254" y1="-1.016" x2="0.254" y2="1.016" layer="21"/>
+<wire x1="-5.08" y1="5.08" x2="-5.08" y2="-5.08" width="0.127" layer="51"/>
+<wire x1="-5.08" y1="-5.08" x2="5.08" y2="-5.08" width="0.127" layer="51"/>
+<wire x1="5.08" y1="-5.08" x2="5.08" y2="5.08" width="0.127" layer="51"/>
+<wire x1="5.08" y1="5.08" x2="-5.08" y2="5.08" width="0.127" layer="51"/>
+<wire x1="-5.08" y1="5.08" x2="5.08" y2="5.08" width="0.0508" layer="39"/>
+<wire x1="5.08" y1="5.08" x2="5.08" y2="-5.08" width="0.0508" layer="39"/>
+<wire x1="5.08" y1="-5.08" x2="-5.08" y2="-5.08" width="0.0508" layer="39"/>
+<wire x1="-5.08" y1="-5.08" x2="-5.08" y2="5.08" width="0.0508" layer="39"/>
+<wire x1="-5.08" y1="5.08" x2="5.08" y2="5.08" width="0.2032" layer="21"/>
+<wire x1="5.08" y1="5.08" x2="5.08" y2="-5.08" width="0.2032" layer="21"/>
+<wire x1="5.08" y1="-5.08" x2="4.445" y2="-5.08" width="0.2032" layer="21"/>
+<wire x1="4.445" y1="-5.08" x2="4.445" y2="-4.445" width="0.2032" layer="21"/>
+<wire x1="4.445" y1="-4.445" x2="-4.445" y2="-4.445" width="0.2032" layer="21"/>
+<wire x1="-4.445" y1="-4.445" x2="-4.445" y2="-5.08" width="0.2032" layer="21"/>
+<wire x1="-4.445" y1="-5.08" x2="-5.08" y2="-5.08" width="0.2032" layer="21"/>
+<wire x1="-5.08" y1="-5.08" x2="-5.08" y2="5.08" width="0.2032" layer="21"/>
 </package>
 </packages>
 <symbols>
-<symbol name="3362S">
+<symbol name="TRIM-3PIN">
+<wire x1="-4.318" y1="2.54" x2="-5.08" y2="2.54" width="0.254" layer="94"/>
+<wire x1="-5.842" y1="2.54" x2="-5.842" y2="-2.54" width="0.254" layer="94"/>
+<wire x1="-4.318" y1="-2.54" x2="-4.318" y2="2.54" width="0.254" layer="94"/>
+<wire x1="-2.54" y1="0" x2="-3.429" y2="0" width="0.1524" layer="94"/>
+<wire x1="-3.429" y1="0" x2="-6.9596" y2="1.7526" width="0.1524" layer="94"/>
+<wire x1="-5.08" y1="2.54" x2="-5.08" y2="5.08" width="0.1524" layer="94"/>
+<wire x1="-5.08" y1="2.54" x2="-5.842" y2="2.54" width="0.254" layer="94"/>
+<wire x1="-5.842" y1="-2.54" x2="-5.08" y2="-2.54" width="0.254" layer="94"/>
+<wire x1="-5.08" y1="-2.54" x2="-4.318" y2="-2.54" width="0.254" layer="94"/>
+<wire x1="-7.366" y1="1.27" x2="-6.731" y2="2.413" width="0.254" layer="94"/>
+<wire x1="-7.62" y1="-2.54" x2="-7.62" y2="-0.508" width="0.1524" layer="94"/>
+<wire x1="-7.62" y1="-0.508" x2="-8.128" y2="-1.524" width="0.1524" layer="94"/>
+<wire x1="-7.62" y1="-0.508" x2="-7.112" y2="-1.524" width="0.1524" layer="94"/>
+<text x="-11.049" y="-3.81" size="1.778" layer="95" rot="R90">&gt;NAME</text>
+<text x="-8.89" y="-3.81" size="1.778" layer="96" rot="R90">&gt;VALUE</text>
+<pin name="1" x="0" y="-5.08" visible="pad" length="short" direction="pas" rot="R180"/>
+<pin name="3" x="0" y="5.08" visible="pad" length="short" direction="pas" rot="R180"/>
+<pin name="2" x="0" y="0" visible="pad" length="short" direction="pas" rot="R180"/>
+<wire x1="-2.54" y1="-5.08" x2="-5.08" y2="-5.08" width="0.1524" layer="94"/>
+<wire x1="-5.08" y1="-5.08" x2="-5.08" y2="-2.54" width="0.1524" layer="94"/>
+<wire x1="-5.08" y1="5.08" x2="-2.54" y2="5.08" width="0.1524" layer="94"/>
+<wire x1="-1.27" y1="6.35" x2="1.27" y2="6.35" width="0.254" layer="94"/>
+<wire x1="1.27" y1="6.35" x2="1.27" y2="-6.35" width="0.254" layer="94"/>
+<wire x1="1.27" y1="-6.35" x2="-1.27" y2="-6.35" width="0.254" layer="94"/>
+<wire x1="-1.27" y1="-6.35" x2="-1.27" y2="6.35" width="0.254" layer="94"/>
+<circle x="0" y="5.08" radius="0.635" width="0.254" layer="94"/>
+<circle x="0" y="0" radius="0.635" width="0.254" layer="94"/>
+<circle x="0" y="-5.08" radius="0.635" width="0.254" layer="94"/>
+</symbol>
+<symbol name="R-TRIM">
 <wire x1="0.762" y1="2.54" x2="0" y2="2.54" width="0.254" layer="94"/>
 <wire x1="-0.762" y1="2.54" x2="-0.762" y2="-2.54" width="0.254" layer="94"/>
 <wire x1="0.762" y1="-2.54" x2="0.762" y2="2.54" width="0.254" layer="94"/>
@@ -594,12 +739,30 @@ NS Package M08A</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="3362S">
+<deviceset name="OFFBOARD_3PIN">
+<description>Off board trimmer</description>
 <gates>
-<gate name="G$1" symbol="3362S" x="0" y="0"/>
+<gate name="G$1" symbol="TRIM-3PIN" x="0" y="0"/>
 </gates>
 <devices>
-<device name="" package="3362S">
+<device name="" package="3PIN">
+<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"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+<deviceset name="BOURNS-3386F" uservalue="yes">
+<gates>
+<gate name="G$1" symbol="R-TRIM" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="3386F">
 <connects>
 <connect gate="G$1" pin="1" pad="1"/>
 <connect gate="G$1" pin="2" pad="2"/>
@@ -613,35 +776,77 @@ NS Package M08A</description>
 </deviceset>
 </devicesets>
 </library>
-<library name="QuantumOptics">
-<description>&lt;b&gt;U of T Physics, Quantum Optics Labs&lt;/b&gt;&lt;p&gt;
-&lt;author&gt;Created by Alan Stummer, Nov '03&lt;/author&gt;&lt;p&gt;
-Various devices, symbols and packages used here.</description>
+<library name="evmik_switches">
 <packages>
-<package name="CONN-BNC-AMP-TYPE1VERT">
-<description>&lt;b&gt;BNC PCB mount connector&lt;/b&gt;, Tyco, vertical, 0.1" grid, types such as 227673-1.&lt;br&gt;
-http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946&amp;PN=227673-1&amp;I=13</description>
-<wire x1="5.461" y1="-8.001" x2="8.001" y2="-5.461" width="0.254" layer="51" curve="90"/>
-<wire x1="8.001" y1="-5.461" x2="8.001" y2="5.461" width="0.254" layer="51"/>
-<wire x1="8.001" y1="5.461" x2="5.461" y2="8.001" width="0.254" layer="51" curve="90"/>
-<wire x1="5.461" y1="8.001" x2="-5.461" y2="8.001" width="0.254" layer="51"/>
-<wire x1="-5.461" y1="8.001" x2="-8.001" y2="5.461" width="0.254" layer="51" curve="90"/>
-<wire x1="-8.001" y1="5.461" x2="-8.001" y2="-5.461" width="0.254" layer="51"/>
-<wire x1="-8.001" y1="-5.461" x2="-5.461" y2="-8.001" width="0.254" layer="51" curve="90"/>
-<wire x1="-5.461" y1="-8.001" x2="5.461" y2="-8.001" width="0.254" layer="51"/>
-<circle x="-5.08" y="-5.08" radius="2.794" width="0.1524" layer="41"/>
-<circle x="-5.08" y="-5.08" radius="2.794" width="0.1524" layer="42"/>
-<circle x="5.08" y="5.08" radius="2.794" width="0.1524" layer="42"/>
-<circle x="5.08" y="-5.08" radius="2.54" width="0" layer="41"/>
-<circle x="-5.08" y="5.08" radius="2.54" width="0" layer="41"/>
-<circle x="5.08" y="5.08" radius="2.794" width="0.1524" layer="41"/>
-<pad name="CONDUCTOR" x="0" y="0" drill="1.0668"/>
-<pad name="SHIELD" x="-2.54" y="0" drill="1.0668"/>
-<pad name="MTG1" x="-5.08" y="-5.08" drill="2.1844" diameter="3.81"/>
-<pad name="MTG2" x="5.08" y="5.08" drill="2.1844" diameter="3.81"/>
-<text x="-4.318" y="1.651" size="1.778" layer="25">&gt;NAME</text>
-<text x="-5.207" y="-3.048" size="1.778" layer="27">&gt;VALUE</text>
+<package name="3PIN">
+<wire x1="-3.81" y1="-2.54" x2="-3.81" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-3.81" y1="-2.54" x2="3.81" y2="-2.54" width="0.2032" layer="21"/>
+<wire x1="3.81" y1="3.175" x2="2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="2.54" y1="3.175" x2="-2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="3.175" x2="-3.81" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="3.81" y1="3.175" x2="3.81" y2="-2.54" 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="0" y="4.3688" size="1.27" layer="25" align="bottom-center">&gt;NAME</text>
+<text x="0" y="5.9609" size="1.27" layer="27" align="bottom-center">&gt;VALUE</text>
+<text x="0" y="-4.445" size="1.27" layer="21" align="bottom-center">2</text>
+<wire x1="-2.54" y1="3.175" x2="-2.54" y2="2.54" width="0.2032" layer="21"/>
+<wire x1="-2.54" y1="2.54" x2="2.54" y2="2.54" width="0.2032" layer="21"/>
+<wire x1="2.54" y1="2.54" x2="2.54" y2="3.175" width="0.2032" layer="21"/>
+<wire x1="-3.81" y1="3.175" x2="-3.81" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="-3.81" y1="-2.54" x2="3.81" y2="-2.54" width="0.2032" layer="51"/>
+<wire x1="3.81" y1="-2.54" x2="3.81" y2="3.175" width="0.2032" layer="51"/>
+<wire x1="3.81" y1="3.175" x2="-3.81" y2="3.175" width="0.2032" layer="51"/>
+<wire x1="-4.445" y1="3.81" x2="-4.445" y2="-3.175" width="0.127" layer="39"/>
+<wire x1="-4.445" y1="-3.175" x2="4.445" y2="-3.175" width="0.127" layer="39"/>
+<wire x1="4.445" y1="-3.175" x2="4.445" y2="3.81" width="0.127" layer="39"/>
+<wire x1="4.445" y1="3.81" x2="-4.445" y2="3.81" width="0.127" layer="39"/>
+<text x="-2.54" y="-4.445" size="1.27" layer="21" align="bottom-center">1</text>
+<text x="2.54" y="-4.445" size="1.27" layer="21" align="bottom-center">3</text>
 </package>
+</packages>
+<symbols>
+<symbol name="SWITCH1AS">
+<wire x1="0" y1="-3.175" x2="0" y2="-2.54" width="0.254" layer="94"/>
+<wire x1="0" y1="-2.54" x2="-1.524" y2="3.048" width="0.254" layer="94"/>
+<wire x1="1.27" y1="2.54" x2="2.54" y2="2.54" width="0.254" layer="94"/>
+<wire x1="2.54" y1="2.54" x2="2.54" y2="3.175" width="0.254" layer="94"/>
+<wire x1="-2.54" y1="2.54" x2="-1.27" y2="2.54" width="0.254" layer="94"/>
+<wire x1="-2.54" y1="2.54" x2="-2.54" y2="3.175" width="0.254" layer="94"/>
+<wire x1="0.508" y1="1.27" x2="1.016" y2="1.524" width="0.1524" layer="94"/>
+<wire x1="0.508" y1="1.27" x2="1.016" y2="1.016" width="0.1524" layer="94"/>
+<wire x1="0.508" y1="1.27" x2="1.524" y2="1.27" width="0.1524" layer="94"/>
+<text x="5.08" y="-2.54" size="1.778" layer="95" rot="R90">&gt;NAME</text>
+<text x="7.62" y="-2.54" size="1.778" layer="96" rot="R90">&gt;VALUE</text>
+<pin name="2" x="0" y="-5.08" visible="pad" length="short" direction="pas" rot="R90"/>
+<pin name="3" x="2.54" y="5.08" visible="pad" length="short" direction="pas" rot="R270"/>
+<pin name="1" x="-2.54" y="5.08" visible="pad" length="short" direction="pas" rot="R270"/>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="OFF_BOARD">
+<description>Off board awitch</description>
+<gates>
+<gate name="G$1" symbol="SWITCH1AS" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="3PIN">
+<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"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
+<library name="evmik_bnc_sma_connectors">
+<packages>
 <package name="CONN-BNC-AMP-TYPE3HORIZ">
 <description>&lt;b&gt;BNC PCB &lt;u&gt;Horizontal&lt;/u&gt; mount connector&lt;/b&gt;, Amp, horizontal, 0.1" grid, types such as 227677-1.&lt;br&gt;
 Don't forget the nut 1-329631-2 and maybe the shoulder washer 330620.&lt;br&gt;
@@ -653,7 +858,6 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;PN=227677-1&amp;M=S
 <wire x1="7.62" y1="-14.605" x2="7.62" y2="0" width="0.254" layer="21"/>
 <wire x1="7.62" y1="0" x2="6.35" y2="0" width="0.254" layer="49"/>
 <wire x1="6.35" y1="0" x2="-1.905" y2="0" width="0.254" layer="49"/>
-<wire x1="-1.905" y1="0" x2="-6.35" y2="0" width="0.254" layer="49"/>
 <wire x1="-6.35" y1="0" x2="-7.62" y2="0" width="0.254" layer="49"/>
 <wire x1="-6.35" y1="8.89" x2="-6.35" y2="6.985" width="0.254" layer="49" style="shortdash"/>
 <wire x1="-6.35" y1="6.985" x2="-6.35" y2="4.445" width="0.254" layer="49" style="shortdash"/>
@@ -672,123 +876,91 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;PN=227677-1&amp;M=S
 <wire x1="-6.35" y1="4.445" x2="6.35" y2="6.35" width="0.254" layer="49" style="shortdash"/>
 <wire x1="-6.35" y1="1.905" x2="6.35" y2="3.81" width="0.254" layer="49" style="shortdash"/>
 <wire x1="-1.905" y1="0" x2="6.35" y2="1.27" width="0.254" layer="49" style="shortdash"/>
-<wire x1="-7.62" y1="-15.24" x2="-7.62" y2="0" width="0.2032" layer="21"/>
-<wire x1="7.62" y1="0" x2="7.62" y2="-15.24" width="0.2032" layer="21"/>
-<wire x1="7.62" y1="-15.24" x2="3.81" y2="-15.24" width="0.2032" layer="41"/>
-<wire x1="3.81" y1="-15.24" x2="3.81" y2="-11.43" width="0.2032" layer="41"/>
-<wire x1="3.81" y1="-11.43" x2="2.54" y2="-10.16" width="0.2032" layer="41"/>
-<wire x1="2.54" y1="-10.16" x2="2.54" y2="-2.54" width="0.2032" layer="41"/>
-<wire x1="2.54" y1="-2.54" x2="-2.54" y2="-2.54" width="0.2032" layer="41"/>
-<wire x1="-2.54" y1="-2.54" x2="-2.54" y2="-10.16" width="0.2032" layer="41"/>
-<wire x1="-2.54" y1="-10.16" x2="-3.81" y2="-11.43" width="0.2032" layer="41"/>
-<wire x1="-3.81" y1="-11.43" x2="-3.81" y2="-15.24" width="0.2032" layer="41"/>
-<wire x1="-3.81" y1="-15.24" x2="-7.62" y2="-15.24" width="0.2032" layer="41"/>
-<wire x1="-7.62" y1="-15.24" x2="-7.62" y2="0" width="0.2032" layer="41"/>
-<wire x1="-7.62" y1="0" x2="7.62" y2="0" width="0.2032" layer="49" style="shortdash"/>
-<wire x1="7.62" y1="0" x2="7.62" y2="-15.24" width="0.2032" layer="41"/>
 <circle x="0" y="18.415" radius="0.635" width="0" layer="49"/>
-<circle x="-5.08" y="-7.62" radius="2.54" width="0.2032" layer="42"/>
-<circle x="5.08" y="-7.62" radius="2.54" width="0.2032" layer="42"/>
 <pad name="CONDUCTOR" x="0" y="-12.7" drill="1.0668" shape="octagon"/>
-<pad name="SHIELD" x="-2.54" y="-12.7" drill="1.0668" shape="octagon"/>
+<pad name="SHIELD1" x="-2.54" y="-12.7" drill="1.0668" shape="octagon"/>
 <pad name="P$1" x="-5.08" y="-7.62" drill="2.1844" shape="octagon"/>
 <pad name="P$2" x="5.08" y="-7.62" drill="2.1844" shape="octagon"/>
-<text x="-4.318" y="-11.049" size="1.778" layer="25" font="vector">&gt;NAME</text>
+<pad name="SHIELD2" x="2.54" y="-12.7" drill="1.0668" shape="octagon"/>
+<text x="0" y="-15.24" size="1.778" layer="25" font="vector" align="top-center">&gt;NAME</text>
 <text x="-3.937" y="-4.318" size="1.778" layer="27" font="vector">&gt;VALUE</text>
+<wire x1="-6.35" y1="0" x2="-1.27" y2="0" width="0.254" layer="21"/>
+<wire x1="-7.62" y1="0" x2="7.62" y2="0" width="0.254" layer="51"/>
+<wire x1="7.62" y1="0" x2="7.62" y2="-14.605" width="0.254" layer="51"/>
+<wire x1="7.62" y1="-14.605" x2="-7.62" y2="-14.605" width="0.254" layer="51"/>
+<wire x1="-7.62" y1="-14.605" x2="-7.62" y2="0" width="0.254" layer="51"/>
+<rectangle x1="-7.62" y1="-14.605" x2="7.62" y2="0" layer="39"/>
+</package>
+<package name="CONN-BNC-AMP-TYPE1VERT">
+<description>&lt;b&gt;BNC, PCB, vertical&lt;/b&gt;, Amp, e.g. isolated 5227222-6, nut 1-329631-2, lock washer 1-329632-2.&lt;br&gt;
+Non-isolated use conn 5227673-1, nut 1-329631-2, lock washer 1-329632-2, shoulder washer 330620.&lt;br&gt;
+http://www.tycoelectronics.com</description>
+<wire x1="5.461" y1="-8.001" x2="8.001" y2="-5.461" width="0.254" layer="51" curve="90"/>
+<wire x1="8.001" y1="-5.461" x2="8.001" y2="5.461" width="0.254" layer="51"/>
+<wire x1="8.001" y1="5.461" x2="5.461" y2="8.001" width="0.254" layer="51" curve="90"/>
+<wire x1="5.461" y1="8.001" x2="-5.461" y2="8.001" width="0.254" layer="51"/>
+<wire x1="-5.461" y1="8.001" x2="-8.001" y2="5.461" width="0.254" layer="51" curve="90"/>
+<wire x1="-8.001" y1="5.461" x2="-8.001" y2="-5.461" width="0.254" layer="51"/>
+<wire x1="-8.001" y1="-5.461" x2="-5.461" y2="-8.001" width="0.254" layer="51" curve="90"/>
+<wire x1="-5.461" y1="-8.001" x2="5.461" y2="-8.001" width="0.254" layer="51"/>
+<circle x="-5.08" y="-5.08" radius="2.794" width="0.1524" layer="41"/>
+<circle x="-5.08" y="-5.08" radius="2.794" width="0.1524" layer="42"/>
+<circle x="5.08" y="5.08" radius="2.794" width="0.1524" layer="42"/>
+<circle x="5.08" y="-5.08" radius="2.54" width="0" layer="41"/>
+<circle x="-5.08" y="5.08" radius="2.54" width="0" layer="41"/>
+<circle x="5.08" y="5.08" radius="2.794" width="0.1524" layer="41"/>
+<pad name="CONDUCTOR" x="0" y="0" drill="1.0668"/>
+<pad name="SHIELD1" x="-2.54" y="0" drill="1.0668"/>
+<pad name="MTG1" x="-5.08" y="-5.08" drill="2.1844" diameter="3.81"/>
+<pad name="MTG2" x="5.08" y="5.08" drill="2.1844" diameter="3.81"/>
+<pad name="SHIELD2" x="2.54" y="0" drill="1.0668"/>
+<text x="-4.318" y="1.651" size="1.778" layer="25">&gt;NAME</text>
+<text x="-5.207" y="-3.048" size="1.778" layer="27">&gt;VALUE</text>
 </package>
 </packages>
 <symbols>
 <symbol name="CONN-BNC">
-<wire x1="0" y1="-5.08" x2="0" y2="-3.683" width="0.254" layer="94"/>
+<wire x1="-5.08" y1="0" x2="0" y2="0" width="0.1524" layer="94"/>
 <circle x="0" y="0" radius="3.5921" width="0.4064" layer="94"/>
 <circle x="0" y="0" radius="0.5236" width="0" layer="94"/>
-<text x="-2.794" y="3.937" size="1.778" layer="95">&gt;NAME</text>
-<text x="4.445" y="-0.381" size="1.778" layer="96">&gt;VALUE</text>
+<text x="3.81" y="2.667" size="1.524" layer="95">&gt;NAME</text>
+<text x="3.937" y="-2.413" size="1.27" layer="96" rot="MR180">&gt;VALUE</text>
 <text x="-2.286" y="0.508" size="1.778" layer="94" font="vector">BNC</text>
-<pin name="CONDUCTOR" x="-5.08" y="0" visible="off" length="middle"/>
-<pin name="SHIELD" x="0" y="-5.08" visible="off" length="point" rot="R90"/>
+<pin name="CONDUCTOR" x="-5.08" y="0" visible="off" length="point"/>
+<pin name="SHIELD2" x="0" y="-5.08" visible="off" length="point" rot="R90"/>
+<pin name="SHIELD1" x="2.54" y="-5.08" visible="off" length="point" rot="R90"/>
+<wire x1="0" y1="-5.08" x2="0" y2="-3.81" width="0.254" layer="94"/>
+<wire x1="2.54" y1="-5.08" x2="2.54" y2="-2.54" width="0.254" layer="94"/>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="CONN-BNC" prefix="J" uservalue="yes">
-<description>&lt;b&gt;BNC PCB connectors&lt;/b&gt;Uses 0.1" grid.&lt;br&gt;
-Amp types such as 227677-1 (horizontal) or 227673-1 (vertical).  Don't forget the nut 1-329631-2 and maybe the shoulder washer 330620.&lt;br&gt;
+<deviceset name="CONN-BNC">
+<description>&lt;b&gt;BNC PCB, horizontal or vertical&lt;/b&gt;, e.g. vertical: Amp 227677-1, nut 1-329631-2, shoulder washer 330620.&lt;br&gt;
+The two shield connections allow the assembly on either side of the board.&lt;br&gt;
+Horiz isolated: 5227222-6, http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;TCPN=5227222-6&amp;RQPN=5227222-6
 http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;PN=227677-1&amp;M=STARTSWITH&amp;LG=1&amp;I=13&amp;button.x=0&amp;button.y=0&lt;br&gt;
 http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946&amp;PN=227673-1&amp;I=13</description>
 <gates>
-<gate name="G$1" symbol="CONN-BNC" x="0" y="0"/>
+<gate name="." symbol="CONN-BNC" x="0" y="0"/>
 </gates>
 <devices>
 <device name="-TYPE1VERT" package="CONN-BNC-AMP-TYPE1VERT">
 <connects>
-<connect gate="G$1" pin="CONDUCTOR" pad="CONDUCTOR"/>
-<connect gate="G$1" pin="SHIELD" pad="SHIELD"/>
+<connect gate="." pin="CONDUCTOR" pad="CONDUCTOR"/>
+<connect gate="." pin="SHIELD1" pad="SHIELD1"/>
+<connect gate="." pin="SHIELD2" pad="SHIELD2"/>
 </connects>
 <technologies>
-<technology name=""/>
+<technology name="">
+<attribute name="DESC" value="Input?" constant="no"/>
+</technology>
 </technologies>
 </device>
 <device name="TYPE3HORIZ" package="CONN-BNC-AMP-TYPE3HORIZ">
 <connects>
-<connect gate="G$1" pin="CONDUCTOR" pad="CONDUCTOR"/>
-<connect gate="G$1" pin="SHIELD" pad="SHIELD"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-</devicesets>
-</library>
-<library name="evmik_switches">
-<packages>
-<package name="SWITCH1AS">
-<wire x1="-6.35" y1="3.81" x2="6.35" y2="3.81" width="0.2032" layer="21"/>
-<wire x1="6.35" y1="3.81" x2="6.35" y2="-7.62" width="0.2032" layer="21"/>
-<wire x1="6.35" y1="-7.62" x2="-6.35" y2="-7.62" width="0.2032" layer="21"/>
-<wire x1="-6.35" y1="-7.62" x2="-6.35" y2="3.81" width="0.2032" layer="21"/>
-<pad name="M2" x="2.54" y="2.54" drill="1.3" diameter="1.9304"/>
-<pad name="1" x="-4.699" y="-8.89" drill="0.8" diameter="1.9304" rot="R90"/>
-<pad name="M1" x="-2.54" y="2.54" drill="1.3" diameter="1.9304"/>
-<pad name="2" x="0" y="-8.89" drill="0.8" diameter="1.9304" rot="R90"/>
-<pad name="3" x="4.699" y="-8.89" drill="0.8" diameter="1.9304" rot="R90"/>
-<text x="-6.604" y="-5.715" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<text x="7.874" y="-5.715" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
-<wire x1="2.9845" y1="3.81" x2="2.9845" y2="7.874" width="0.2032" layer="27"/>
-<wire x1="2.9845" y1="7.874" x2="-2.9845" y2="7.874" width="0.2032" layer="27"/>
-<wire x1="-2.9845" y1="7.874" x2="-2.9845" y2="3.81" width="0.2032" layer="27"/>
-</package>
-</packages>
-<symbols>
-<symbol name="SWITCH1AS">
-<wire x1="0" y1="-3.175" x2="0" y2="-2.54" width="0.254" layer="94"/>
-<wire x1="0" y1="-2.54" x2="-1.524" y2="3.048" width="0.254" layer="94"/>
-<wire x1="1.27" y1="2.54" x2="2.54" y2="2.54" width="0.254" layer="94"/>
-<wire x1="2.54" y1="2.54" x2="2.54" y2="3.175" width="0.254" layer="94"/>
-<wire x1="-2.54" y1="2.54" x2="-1.27" y2="2.54" width="0.254" layer="94"/>
-<wire x1="-2.54" y1="2.54" x2="-2.54" y2="3.175" width="0.254" layer="94"/>
-<wire x1="0.508" y1="1.27" x2="1.016" y2="1.524" width="0.1524" layer="94"/>
-<wire x1="0.508" y1="1.27" x2="1.016" y2="1.016" width="0.1524" layer="94"/>
-<wire x1="0.508" y1="1.27" x2="1.524" y2="1.27" width="0.1524" layer="94"/>
-<text x="5.08" y="-2.54" size="1.778" layer="95" rot="R90">&gt;NAME</text>
-<text x="7.62" y="-2.54" size="1.778" layer="96" rot="R90">&gt;VALUE</text>
-<pin name="2" x="0" y="-5.08" visible="pad" length="short" direction="pas" rot="R90"/>
-<pin name="3" x="2.54" y="5.08" visible="pad" length="short" direction="pas" rot="R270"/>
-<pin name="1" x="-2.54" y="5.08" visible="pad" length="short" direction="pas" rot="R270"/>
-</symbol>
-</symbols>
-<devicesets>
-<deviceset name="SWITCH1AS">
-<gates>
-<gate name="G$1" symbol="SWITCH1AS" x="0" y="0"/>
-</gates>
-<devices>
-<device name="" package="SWITCH1AS">
-<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="." pin="CONDUCTOR" pad="CONDUCTOR"/>
+<connect gate="." pin="SHIELD1" pad="SHIELD1"/>
+<connect gate="." pin="SHIELD2" pad="SHIELD2"/>
 </connects>
 <technologies>
 <technology name=""/>
@@ -813,8 +985,8 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <part name="ALPS" library="evmik_opamp" deviceset="OPAMP_GENERIC" device="DIP8"/>
 <part name="R5" library="evmik_rcl" deviceset="R1206" device="" value="10k"/>
 <part name="R7" library="evmik_rcl" deviceset="R1206" device="" value="1k"/>
-<part name="15_EXT2" library="evmik_connectors_3pin" deviceset="15V_3PIN" device=""/>
-<part name="15V_EXT1" library="evmik_connectors_3pin" deviceset="15V_3PIN" device="" value="15V_3PIN"/>
+<part name="POWER_OUT" library="evmik_connectors_3pin" deviceset="15V_3PIN" device=""/>
+<part name="POWER_IN" library="evmik_connectors_3pin" deviceset="15V_3PIN" device="" value="15V_3PIN"/>
 <part name="SUPPLY2" library="supply2" deviceset="+15V" device=""/>
 <part name="SUPPLY3" library="supply2" deviceset="-15V" device=""/>
 <part name="SUPPLY4" library="supply2" deviceset="-15V" device=""/>
@@ -826,10 +998,10 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <part name="SUPPLY12" library="supply2" deviceset="+15V" device=""/>
 <part name="SUPPLY13" library="supply2" deviceset="+15V" device=""/>
 <part name="SUPPLY14" library="supply2" deviceset="+15V" device=""/>
-<part name="C1" library="evmik_rcl" deviceset="C1206" device="" value="1u"/>
+<part name="C1" library="evmik_rcl" deviceset="C0805" device="" value="1u"/>
 <part name="OUT" library="evmik_opamp" deviceset="OPAMP_GENERIC" device="DIP8"/>
 <part name="R1" library="evmik_rcl" deviceset="R1206" device="" value="100k"/>
-<part name="C2" library="evmik_rcl" deviceset="C1206" device="" value="70uF"/>
+<part name="C2" library="evmik_rcl" deviceset="C0805" device="" value="70uF"/>
 <part name="SUPPLY16" library="supply2" deviceset="GND" device=""/>
 <part name="SUPPLY17" library="supply2" deviceset="+15V" device=""/>
 <part name="SUPPLY18" library="supply2" deviceset="-15V" device=""/>
@@ -846,9 +1018,9 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <part name="SUPPLY20" library="supply2" deviceset="-15V" device=""/>
 <part name="SUPPLY21" library="supply2" deviceset="GND" device=""/>
 <part name="R6" library="evmik_rcl" deviceset="R1206" device="" value="1k"/>
-<part name="REFERENCE" library="QuantumOptics" deviceset="CONN-BNC" device="TYPE3HORIZ"/>
-<part name="INPUT" library="QuantumOptics" deviceset="CONN-BNC" device="TYPE3HORIZ"/>
-<part name="OUTPUT" library="QuantumOptics" deviceset="CONN-BNC" device="TYPE3HORIZ"/>
+<part name="REFERENCE" library="evmik_bnc_sma_connectors" deviceset="CONN-BNC" device="TYPE3HORIZ"/>
+<part name="INPUT" library="evmik_bnc_sma_connectors" deviceset="CONN-BNC" device="TYPE3HORIZ"/>
+<part name="OUTPUT" library="evmik_bnc_sma_connectors" deviceset="CONN-BNC" device="TYPE3HORIZ"/>
 <part name="SUPPLY23" library="supply2" deviceset="GND" device=""/>
 <part name="SUPPLY24" library="supply2" deviceset="GND" device=""/>
 <part name="SUPPLY25" library="supply2" deviceset="GND" device=""/>
@@ -858,28 +1030,32 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <part name="INBUF" library="evmik_opamp" deviceset="OPAMP_GENERIC" device="DIP8"/>
 <part name="SUPPLY26" library="supply2" deviceset="-15V" device=""/>
 <part name="SUPPLY27" library="supply2" deviceset="+15V" device=""/>
-<part name="C4" library="evmik_rcl" deviceset="C1206" device="" value="22u"/>
+<part name="C4" library="evmik_rcl" deviceset="C0805" device="" value="22u"/>
 <part name="R9" library="evmik_rcl" deviceset="R1206" device="" value="1k"/>
 <part name="SUPPLY28" library="supply2" deviceset="GND" device=""/>
 <part name="R10" library="evmik_rcl" deviceset="R1206" device="" value="100k"/>
 <part name="R11" library="evmik_rcl" deviceset="R1206" device="" value="100k"/>
-<part name="C5" library="evmik_rcl" deviceset="C1206" device="" value="70uF"/>
-<part name="C6" library="evmik_rcl" deviceset="C1206" device="" value="70uF"/>
-<part name="SWITCH" library="evmik_switches" deviceset="SWITCH1AS" device=""/>
-<part name="VGAIN" library="evmik_trimmers" deviceset="3362S" device=""/>
-<part name="VPHASE" library="evmik_trimmers" deviceset="3362S" device=""/>
+<part name="C5" library="evmik_rcl" deviceset="C0805" device="" value="70uF"/>
+<part name="C6" library="evmik_rcl" deviceset="C0805" device="" value="70uF"/>
+<part name="SWITCH" library="evmik_switches" deviceset="OFF_BOARD" device=""/>
+<part name="VGAIN" library="evmik_trimmers" deviceset="BOURNS-3386F" device=""/>
+<part name="VPHASE" library="evmik_trimmers" deviceset="OFFBOARD_3PIN" device=""/>
 <part name="+15V" library="evmik_testpads" deviceset="TP-13" device=""/>
 <part name="-15V" library="evmik_testpads" deviceset="TP-13" device=""/>
 <part name="SUPPLY1" library="supply2" deviceset="GND" device=""/>
 <part name="SUPPLY7" library="supply2" deviceset="+15V" device=""/>
 <part name="SUPPLY9" library="supply2" deviceset="-15V" device=""/>
-<part name="C3" library="evmik_rcl" deviceset="C1206" device="" value="15p"/>
+<part name="C3" library="evmik_rcl" deviceset="C0805" device="" value="15p"/>
 <part name="INVERTER" library="evmik_testpads" deviceset="TP-13" device=""/>
 <part name="SUPPLY29" library="supply2" deviceset="+15V" device=""/>
 <part name="R8" library="evmik_rcl" deviceset="R1206" device="" value="1k"/>
 <part name="R12" library="evmik_rcl" deviceset="R1206" device="" value="1k"/>
 <part name="SUPPLY30" library="supply2" deviceset="GND" device=""/>
 <part name="REFV" library="evmik_testpads" deviceset="TP-13" device=""/>
+<part name="C7" library="evmik_rcl" deviceset="CPOL1206" device=""/>
+<part name="C8" library="evmik_rcl" deviceset="CPOL1206" device=""/>
+<part name="C9" library="evmik_rcl" deviceset="C0805" device=""/>
+<part name="C10" library="evmik_rcl" deviceset="C0805" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -909,8 +1085,8 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <instance part="ALPS" gate="G$1" x="-22.86" y="66.04"/>
 <instance part="R5" gate="G$1" x="-99.06" y="66.04"/>
 <instance part="R7" gate="G$1" x="-43.18" y="88.9"/>
-<instance part="15_EXT2" gate="G$1" x="88.9" y="58.42"/>
-<instance part="15V_EXT1" gate="G$1" x="60.96" y="58.42"/>
+<instance part="POWER_OUT" gate="G$1" x="88.9" y="58.42"/>
+<instance part="POWER_IN" gate="G$1" x="60.96" y="58.42"/>
 <instance part="SUPPLY2" gate="+15V" x="91.44" y="45.72" rot="R180"/>
 <instance part="SUPPLY3" gate="G$1" x="86.36" y="45.72"/>
 <instance part="SUPPLY4" gate="G$1" x="-86.36" y="50.8"/>
@@ -922,10 +1098,10 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <instance part="SUPPLY12" gate="+15V" x="-86.36" y="76.2"/>
 <instance part="SUPPLY13" gate="+15V" x="-25.4" y="78.74"/>
 <instance part="SUPPLY14" gate="+15V" x="35.56" y="2.54" rot="R270"/>
-<instance part="C1" gate="G$1" x="-45.72" y="63.5" rot="R90"/>
+<instance part="C1" gate="G$1" x="-40.64" y="63.5"/>
 <instance part="OUT" gate="G$1" x="104.14" y="10.16"/>
 <instance part="R1" gate="G$1" x="76.2" y="7.62"/>
-<instance part="C2" gate="G$1" x="83.82" y="2.54"/>
+<instance part="C2" gate="G$1" x="83.82" y="0" rot="R270"/>
 <instance part="SUPPLY16" gate="GND" x="83.82" y="-7.62"/>
 <instance part="SUPPLY17" gate="+15V" x="101.6" y="22.86"/>
 <instance part="SUPPLY18" gate="G$1" x="101.6" y="-2.54"/>
@@ -942,9 +1118,9 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <instance part="SUPPLY20" gate="G$1" x="-35.56" y="-12.7"/>
 <instance part="SUPPLY21" gate="GND" x="-55.88" y="-30.48"/>
 <instance part="R6" gate="G$1" x="-45.72" y="55.88"/>
-<instance part="REFERENCE" gate="G$1" x="-83.82" y="2.54" rot="MR0"/>
-<instance part="INPUT" gate="G$1" x="-165.1" y="58.42" rot="MR0"/>
-<instance part="OUTPUT" gate="G$1" x="129.54" y="10.16"/>
+<instance part="REFERENCE" gate="." x="-83.82" y="2.54" rot="MR0"/>
+<instance part="INPUT" gate="." x="-165.1" y="58.42" rot="MR0"/>
+<instance part="OUTPUT" gate="." x="129.54" y="10.16"/>
 <instance part="SUPPLY23" gate="GND" x="-165.1" y="45.72"/>
 <instance part="SUPPLY24" gate="GND" x="-83.82" y="-12.7"/>
 <instance part="SUPPLY25" gate="GND" x="129.54" y="-2.54"/>
@@ -954,13 +1130,13 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <instance part="INBUF" gate="G$1" x="-142.24" y="60.96"/>
 <instance part="SUPPLY26" gate="G$1" x="-144.78" y="48.26"/>
 <instance part="SUPPLY27" gate="+15V" x="-144.78" y="73.66"/>
-<instance part="C4" gate="G$1" x="-124.46" y="60.96" rot="R90"/>
+<instance part="C4" gate="G$1" x="-124.46" y="60.96"/>
 <instance part="R9" gate="G$1" x="-116.84" y="53.34" rot="R270"/>
 <instance part="SUPPLY28" gate="GND" x="-116.84" y="43.18"/>
 <instance part="R10" gate="G$1" x="60.96" y="7.62"/>
 <instance part="R11" gate="G$1" x="45.72" y="7.62"/>
-<instance part="C5" gate="G$1" x="66.04" y="2.54"/>
-<instance part="C6" gate="G$1" x="50.8" y="2.54"/>
+<instance part="C5" gate="G$1" x="66.04" y="0" rot="R270"/>
+<instance part="C6" gate="G$1" x="50.8" y="0" rot="R270"/>
 <instance part="SWITCH" gate="G$1" x="-48.26" y="-10.16" rot="R90"/>
 <instance part="VGAIN" gate="G$1" x="-78.74" y="91.44"/>
 <instance part="VPHASE" gate="G$1" x="-35.56" y="55.88" rot="R90"/>
@@ -969,13 +1145,17 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <instance part="SUPPLY1" gate="GND" x="60.96" y="48.26"/>
 <instance part="SUPPLY7" gate="+15V" x="63.5" y="43.18" rot="R180"/>
 <instance part="SUPPLY9" gate="G$1" x="58.42" y="43.18"/>
-<instance part="C3" gate="G$1" x="-35.56" y="30.48" rot="R90"/>
+<instance part="C3" gate="G$1" x="-35.56" y="30.48"/>
 <instance part="INVERTER" gate="G$1" x="-20.32" y="0"/>
 <instance part="SUPPLY29" gate="+15V" x="121.92" y="91.44"/>
 <instance part="R8" gate="G$1" x="121.92" y="76.2" rot="R270"/>
 <instance part="R12" gate="G$1" x="121.92" y="55.88" rot="R270"/>
 <instance part="SUPPLY30" gate="GND" x="121.92" y="43.18"/>
 <instance part="REFV" gate="G$1" x="127" y="66.04"/>
+<instance part="C7" gate="G$1" x="60.96" y="124.46" rot="R180"/>
+<instance part="C8" gate="G$1" x="73.66" y="124.46" rot="R180"/>
+<instance part="C9" gate="G$1" x="60.96" y="111.76"/>
+<instance part="C10" gate="G$1" x="71.12" y="111.76"/>
 </instances>
 <busses>
 </busses>
@@ -1018,7 +1198,7 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <pinref part="SUPPLY3" gate="G$1" pin="-15V"/>
 <pinref part="-15V" gate="G$1" pin="TP"/>
 <wire x1="81.28" y1="48.26" x2="86.36" y2="48.26" width="0.1524" layer="91"/>
-<pinref part="15_EXT2" gate="G$1" pin="-15V"/>
+<pinref part="POWER_OUT" gate="G$1" pin="-15V"/>
 <wire x1="86.36" y1="53.34" x2="86.36" y2="48.26" width="0.1524" layer="91"/>
 <junction x="86.36" y="48.26"/>
 </segment>
@@ -1053,10 +1233,17 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <wire x1="-144.78" y1="50.8" x2="-144.78" y2="53.34" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="15V_EXT1" gate="G$1" pin="-15V"/>
+<pinref part="POWER_IN" gate="G$1" pin="-15V"/>
 <pinref part="SUPPLY9" gate="G$1" pin="-15V"/>
 <wire x1="58.42" y1="53.34" x2="58.42" y2="45.72" width="0.1524" layer="91"/>
 </segment>
+<segment>
+<pinref part="C8" gate="G$1" pin="-"/>
+<wire x1="76.2" y1="124.46" x2="78.74" y2="124.46" width="0.1524" layer="91"/>
+<wire x1="78.74" y1="124.46" x2="78.74" y2="111.76" width="0.1524" layer="91"/>
+<pinref part="C10" gate="G$1" pin="2"/>
+<wire x1="78.74" y1="111.76" x2="73.66" y2="111.76" width="0.1524" layer="91"/>
+</segment>
 </net>
 <net name="GND" class="0">
 <segment>
@@ -1078,30 +1265,46 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <pinref part="GND" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<wire x1="83.82" y1="-5.08" x2="83.82" y2="-2.54" width="0.1524" layer="91"/>
 <pinref part="C2" gate="G$1" pin="2"/>
+<wire x1="83.82" y1="-5.08" x2="83.82" y2="-2.54" width="0.1524" layer="91"/>
 <pinref part="SUPPLY16" gate="GND" pin="GND"/>
 <pinref part="C6" gate="G$1" pin="2"/>
 <pinref part="C5" gate="G$1" pin="2"/>
-<wire x1="50.8" y1="-2.54" x2="66.04" y2="-2.54" width="0.1524" layer="91"/>
-<wire x1="66.04" y1="-2.54" x2="83.82" y2="-2.54" width="0.1524" layer="91"/>
-<junction x="66.04" y="-2.54"/>
-<junction x="83.82" y="-2.54"/>
+<wire x1="50.8" y1="-2.54" x2="50.8" y2="-5.08" width="0.1524" layer="91"/>
+<wire x1="50.8" y1="-5.08" x2="66.04" y2="-5.08" width="0.1524" layer="91"/>
+<wire x1="66.04" y1="-5.08" x2="66.04" y2="-2.54" width="0.1524" layer="91"/>
+<wire x1="83.82" y1="-5.08" x2="66.04" y2="-5.08" width="0.1524" layer="91"/>
+<junction x="83.82" y="-5.08"/>
+<junction x="66.04" y="-5.08"/>
 </segment>
 <segment>
-<pinref part="OUTPUT" gate="G$1" pin="SHIELD"/>
+<pinref part="OUTPUT" gate="." pin="SHIELD2"/>
 <pinref part="SUPPLY25" gate="GND" pin="GND"/>
 <wire x1="129.54" y1="5.08" x2="129.54" y2="0" width="0.1524" layer="91"/>
+<pinref part="OUTPUT" gate="." pin="SHIELD1"/>
+<wire x1="132.08" y1="5.08" x2="132.08" y2="0" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="0" x2="129.54" y2="0" width="0.1524" layer="91"/>
+<junction x="129.54" y="0"/>
 </segment>
 <segment>
-<pinref part="INPUT" gate="G$1" pin="SHIELD"/>
+<pinref part="INPUT" gate="." pin="SHIELD2"/>
 <pinref part="SUPPLY23" gate="GND" pin="GND"/>
-<wire x1="-165.1" y1="48.26" x2="-165.1" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="-165.1" y1="48.26" x2="-165.1" y2="50.8" width="0.1524" layer="91"/>
+<pinref part="INPUT" gate="." pin="SHIELD1"/>
+<wire x1="-165.1" y1="50.8" x2="-165.1" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="-167.64" y1="53.34" x2="-167.64" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="-167.64" y1="50.8" x2="-165.1" y2="50.8" width="0.1524" layer="91"/>
+<junction x="-165.1" y="50.8"/>
 </segment>
 <segment>
 <pinref part="SUPPLY24" gate="GND" pin="GND"/>
-<pinref part="REFERENCE" gate="G$1" pin="SHIELD"/>
-<wire x1="-83.82" y1="-2.54" x2="-83.82" y2="-10.16" width="0.1524" layer="91"/>
+<pinref part="REFERENCE" gate="." pin="SHIELD2"/>
+<wire x1="-83.82" y1="-2.54" x2="-83.82" y2="-5.08" width="0.1524" layer="91"/>
+<pinref part="REFERENCE" gate="." pin="SHIELD1"/>
+<wire x1="-83.82" y1="-5.08" x2="-83.82" y2="-10.16" width="0.1524" layer="91"/>
+<wire x1="-86.36" y1="-2.54" x2="-86.36" y2="-5.08" width="0.1524" layer="91"/>
+<wire x1="-86.36" y1="-5.08" x2="-83.82" y2="-5.08" width="0.1524" layer="91"/>
+<junction x="-83.82" y="-5.08"/>
 </segment>
 <segment>
 <pinref part="R9" gate="G$1" pin="2"/>
@@ -1109,12 +1312,12 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <wire x1="-116.84" y1="48.26" x2="-116.84" y2="45.72" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="15_EXT2" gate="G$1" pin="GND"/>
+<pinref part="POWER_OUT" gate="G$1" pin="GND"/>
 <pinref part="SUPPLY8" gate="GND" pin="GND"/>
 <wire x1="88.9" y1="53.34" x2="88.9" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="15V_EXT1" gate="G$1" pin="GND"/>
+<pinref part="POWER_IN" gate="G$1" pin="GND"/>
 <pinref part="SUPPLY1" gate="GND" pin="GND"/>
 <wire x1="60.96" y1="53.34" x2="60.96" y2="50.8" width="0.1524" layer="91"/>
 </segment>
@@ -1135,6 +1338,18 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <pinref part="SUPPLY30" gate="GND" pin="GND"/>
 <wire x1="121.92" y1="50.8" x2="121.92" y2="45.72" width="0.1524" layer="91"/>
 </segment>
+<segment>
+<pinref part="C7" gate="G$1" pin="-"/>
+<pinref part="C8" gate="G$1" pin="+"/>
+<wire x1="63.5" y1="124.46" x2="66.04" y2="124.46" width="0.1524" layer="91"/>
+<pinref part="C10" gate="G$1" pin="1"/>
+<wire x1="68.58" y1="111.76" x2="66.04" y2="111.76" width="0.1524" layer="91"/>
+<wire x1="71.12" y1="124.46" x2="66.04" y2="124.46" width="0.1524" layer="91"/>
+<wire x1="66.04" y1="124.46" x2="66.04" y2="111.76" width="0.1524" layer="91"/>
+<junction x="66.04" y="111.76"/>
+<pinref part="C9" gate="G$1" pin="2"/>
+<wire x1="63.5" y1="111.76" x2="66.04" y2="111.76" width="0.1524" layer="91"/>
+</segment>
 </net>
 <net name="+15V" class="0">
 <segment>
@@ -1156,7 +1371,7 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <pinref part="SUPPLY2" gate="+15V" pin="+15V"/>
 <pinref part="+15V" gate="G$1" pin="TP"/>
 <wire x1="96.52" y1="48.26" x2="91.44" y2="48.26" width="0.1524" layer="91"/>
-<pinref part="15_EXT2" gate="G$1" pin="+15V"/>
+<pinref part="POWER_OUT" gate="G$1" pin="+15V"/>
 <wire x1="91.44" y1="53.34" x2="91.44" y2="48.26" width="0.1524" layer="91"/>
 <junction x="91.44" y="48.26"/>
 </segment>
@@ -1176,7 +1391,7 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <wire x1="-144.78" y1="71.12" x2="-144.78" y2="68.58" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="15V_EXT1" gate="G$1" pin="+15V"/>
+<pinref part="POWER_IN" gate="G$1" pin="+15V"/>
 <pinref part="SUPPLY7" gate="+15V" pin="+15V"/>
 <wire x1="63.5" y1="53.34" x2="63.5" y2="45.72" width="0.1524" layer="91"/>
 </segment>
@@ -1185,6 +1400,13 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <wire x1="121.92" y1="88.9" x2="121.92" y2="81.28" width="0.1524" layer="91"/>
 <pinref part="SUPPLY29" gate="+15V" pin="+15V"/>
 </segment>
+<segment>
+<pinref part="C7" gate="G$1" pin="+"/>
+<wire x1="58.42" y1="124.46" x2="55.88" y2="124.46" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="124.46" x2="55.88" y2="111.76" width="0.1524" layer="91"/>
+<pinref part="C9" gate="G$1" pin="1"/>
+<wire x1="55.88" y1="111.76" x2="58.42" y2="111.76" width="0.1524" layer="91"/>
+</segment>
 </net>
 <net name="N$5" class="0">
 <segment>
@@ -1213,7 +1435,7 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <segment>
 <wire x1="81.28" y1="7.62" x2="83.82" y2="7.62" width="0.1524" layer="91"/>
 <wire x1="83.82" y1="7.62" x2="96.52" y2="7.62" width="0.1524" layer="91"/>
-<wire x1="83.82" y1="5.08" x2="83.82" y2="7.62" width="0.1524" layer="91"/>
+<wire x1="83.82" y1="2.54" x2="83.82" y2="7.62" width="0.1524" layer="91"/>
 <junction x="83.82" y="7.62"/>
 <pinref part="R1" gate="G$1" pin="2"/>
 <pinref part="OUT" gate="G$1" pin="+IN"/>
@@ -1230,7 +1452,7 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <junction x="114.3" y="10.16"/>
 <pinref part="OUT" gate="G$1" pin="OUT"/>
 <pinref part="OUT" gate="G$1" pin="-IN"/>
-<pinref part="OUTPUT" gate="G$1" pin="CONDUCTOR"/>
+<pinref part="OUTPUT" gate="." pin="CONDUCTOR"/>
 <wire x1="114.3" y1="10.16" x2="119.38" y2="10.16" width="0.1524" layer="91"/>
 <pinref part="VOUT" gate="G$1" pin="TP"/>
 <wire x1="119.38" y1="10.16" x2="124.46" y2="10.16" width="0.1524" layer="91"/>
@@ -1263,16 +1485,16 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <segment>
 <pinref part="C1" gate="G$1" pin="2"/>
 <pinref part="ALPS" gate="G$1" pin="+IN"/>
-<wire x1="-40.64" y1="63.5" x2="-35.56" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="-38.1" y1="63.5" x2="-35.56" y2="63.5" width="0.1524" layer="91"/>
 <wire x1="-35.56" y1="63.5" x2="-30.48" y2="63.5" width="0.1524" layer="91"/>
-<wire x1="-35.56" y1="60.96" x2="-35.56" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="-35.56" y1="55.88" x2="-35.56" y2="63.5" width="0.1524" layer="91"/>
 <junction x="-35.56" y="63.5"/>
 <pinref part="VPHASE" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="N$11" class="0">
 <segment>
-<pinref part="REFERENCE" gate="G$1" pin="CONDUCTOR"/>
+<pinref part="REFERENCE" gate="." pin="CONDUCTOR"/>
 <wire x1="-78.74" y1="2.54" x2="-76.2" y2="2.54" width="0.1524" layer="91"/>
 <pinref part="VREF" gate="G$1" pin="TP"/>
 <pinref part="R3" gate="G$1" pin="1"/>
@@ -1301,7 +1523,7 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 </net>
 <net name="N$17" class="0">
 <segment>
-<pinref part="INPUT" gate="G$1" pin="CONDUCTOR"/>
+<pinref part="INPUT" gate="." pin="CONDUCTOR"/>
 <pinref part="VIN" gate="G$1" pin="TP"/>
 <pinref part="INBUF" gate="G$1" pin="+IN"/>
 <wire x1="-160.02" y1="58.42" x2="-149.86" y2="58.42" width="0.1524" layer="91"/>
@@ -1313,7 +1535,7 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <segment>
 <pinref part="C4" gate="G$1" pin="2"/>
 <pinref part="INGN" gate="G$1" pin="+IN"/>
-<wire x1="-119.38" y1="60.96" x2="-116.84" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="-121.92" y1="60.96" x2="-116.84" y2="60.96" width="0.1524" layer="91"/>
 <pinref part="R9" gate="G$1" pin="1"/>
 <wire x1="-116.84" y1="60.96" x2="-91.44" y2="60.96" width="0.1524" layer="91"/>
 <wire x1="-116.84" y1="58.42" x2="-116.84" y2="60.96" width="0.1524" layer="91"/>
@@ -1326,7 +1548,7 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <pinref part="R10" gate="G$1" pin="1"/>
 <wire x1="55.88" y1="7.62" x2="50.8" y2="7.62" width="0.1524" layer="91"/>
 <pinref part="C6" gate="G$1" pin="1"/>
-<wire x1="50.8" y1="5.08" x2="50.8" y2="7.62" width="0.1524" layer="91"/>
+<wire x1="50.8" y1="2.54" x2="50.8" y2="7.62" width="0.1524" layer="91"/>
 <junction x="50.8" y="7.62"/>
 </segment>
 </net>
@@ -1336,7 +1558,7 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <pinref part="R1" gate="G$1" pin="1"/>
 <wire x1="71.12" y1="7.62" x2="66.04" y2="7.62" width="0.1524" layer="91"/>
 <pinref part="C5" gate="G$1" pin="1"/>
-<wire x1="66.04" y1="7.62" x2="66.04" y2="5.08" width="0.1524" layer="91"/>
+<wire x1="66.04" y1="7.62" x2="66.04" y2="2.54" width="0.1524" layer="91"/>
 <junction x="66.04" y="7.62"/>
 </segment>
 </net>
@@ -1354,7 +1576,7 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <junction x="-71.12" y="63.5"/>
 <pinref part="C1" gate="G$1" pin="1"/>
 <wire x1="-50.8" y1="76.2" x2="-50.8" y2="63.5" width="0.1524" layer="91"/>
-<wire x1="-50.8" y1="63.5" x2="-48.26" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="-50.8" y1="63.5" x2="-43.18" y2="63.5" width="0.1524" layer="91"/>
 <wire x1="-55.88" y1="76.2" x2="-50.8" y2="76.2" width="0.1524" layer="91"/>
 <pinref part="R7" gate="G$1" pin="1"/>
 <wire x1="-48.26" y1="88.9" x2="-50.8" y2="88.9" width="0.1524" layer="91"/>
@@ -1390,7 +1612,7 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <pinref part="R4" gate="G$1" pin="2"/>
 <pinref part="INVT" gate="G$1" pin="OUT"/>
 <pinref part="C3" gate="G$1" pin="2"/>
-<wire x1="-30.48" y1="30.48" x2="-22.86" y2="30.48" width="0.1524" layer="91"/>
+<wire x1="-33.02" y1="30.48" x2="-22.86" y2="30.48" width="0.1524" layer="91"/>
 <wire x1="-22.86" y1="30.48" x2="-22.86" y2="22.86" width="0.1524" layer="91"/>
 <junction x="-22.86" y="22.86"/>
 <junction x="-22.86" y="0"/>
@@ -1415,6 +1637,11 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <pinref part="REFV" gate="G$1" pin="TP"/>
 <junction x="127" y="66.04"/>
 </segment>
+<segment>
+<pinref part="U$1" gate="G$1" pin="SELA"/>
+<wire x1="-2.54" y1="2.54" x2="-2.54" y2="-2.54" width="0.1524" layer="91"/>
+<label x="-2.54" y="-5.08" size="1.778" layer="95"/>
+</segment>
 </net>
 </nets>
 </sheet>
@@ -1423,9 +1650,6 @@ http://catalog.tycoelectronics.com/TE/bin/TE.Connect?C=1&amp;M=BYPN&amp;PID=4946
 <approved hash="113,1,-83.82,63.5,INGN,,,,,"/>
 <approved hash="113,1,104.14,10.16,OUT,,,,,"/>
 <approved hash="113,1,-33.02,0,INVT,,,,,"/>
-<approved hash="113,1,-85.8662,0.994831,REFERENCE,,,,,"/>
-<approved hash="113,1,-163.116,56.8748,INPUT,,,,,"/>
-<approved hash="113,1,128.971,8.61483,OUTPUT,,,,,"/>
 <approved hash="113,1,-142.24,60.96,INBUF,,,,,"/>
 </errors>
 </schematic>
-- 
cgit v1.2.3