From 5ea78e4a74db9502ecc3ee48fd558d795c01ee58 Mon Sep 17 00:00:00 2001
From: Michael Ossmann <mike@ossmann.com>
Date: Fri, 17 Aug 2012 13:08:58 -0600
Subject: [PATCH] module selection

---
 hardware/kicad/hackrf.mod            |   67 +-
 hardware/licorice/licorice-cache.lib |    2 +-
 hardware/licorice/licorice.cmp       |  840 ++++++------
 hardware/licorice/licorice.net       |  845 ++++++------
 hardware/licorice/licorice.sch       | 1765 +++++++++++++-------------
 5 files changed, 1807 insertions(+), 1712 deletions(-)

diff --git a/hardware/kicad/hackrf.mod b/hardware/kicad/hackrf.mod
index 1f0aac46..018b430b 100644
--- a/hardware/kicad/hackrf.mod
+++ b/hardware/kicad/hackrf.mod
@@ -1,4 +1,4 @@
-PCBNEW-LibModule-V1  Tue Jul 17 11:40:54 2012
+PCBNEW-LibModule-V1  Fri Aug 17 12:12:42 2012
 # encoding utf-8
 $INDEX
 GSG-HEADER-1x3
@@ -38,6 +38,7 @@ GSG-SKY13350-385LF
 GSG-DFN6-3
 GSG-SKY13411-374LF
 GSG-FI168B/L
+GSG-SOT363
 $EndINDEX
 $INDEX
 GSG-QFN48-7
@@ -8167,7 +8168,7 @@ $MODULE GSG-FI168B/L
 Po 0 0 0 15 5005A33B 00000000 ~~
 Li GSG-FI168B/L
 Sc 00000000
-AR 
+AR
 Op 0 0 0
 T0 0 0 157 118 0 30 N V 21 N "GSG-FI168B/L"
 T1 0 0 157 118 0 30 N I 21 N "VAL**"
@@ -8209,4 +8210,66 @@ Po 0 177
 Le 1341
 $EndPAD
 $EndMODULE  GSG-FI168B/L
+$MODULE GSG-SOT363
+Po 0 0 0 15 502E8993 00000000 ~~
+Li GSG-SOT363
+Sc 00000000
+AR SOT457
+Op 0 0 0
+T0 0 0 250 250 0 63 N V 21 N "GSG-SOT363"
+T1 0 0 250 250 0 63 N I 21 N "VAL**"
+DS -394 -246 394 -246 80 21
+DS 394 -246 394 246 80 21
+DS 394 246 -394 246 80 21
+DS -394 246 -394 -246 80 21
+DC -197 118 -157 118 80 21
+$PAD
+Sh "1" R 180 390 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -260 395
+Le 33
+$EndPAD
+$PAD
+Sh "2" R 180 390 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 0 395
+Le -1563238664
+$EndPAD
+$PAD
+Sh "3" R 180 390 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 260 395
+Le -1381633
+$EndPAD
+$PAD
+Sh "4" R 180 390 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 260 -395
+Le 1701209717
+$EndPAD
+$PAD
+Sh "5" R 180 390 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 0 -395
+Le 48
+$EndPAD
+$PAD
+Sh "6" R 180 390 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -260 -395
+Le 65
+$EndPAD
+$EndMODULE  GSG-SOT363
 $EndLIBRARY
diff --git a/hardware/licorice/licorice-cache.lib b/hardware/licorice/licorice-cache.lib
index 50cdaa2b..d38dfc7f 100644
--- a/hardware/licorice/licorice-cache.lib
+++ b/hardware/licorice/licorice-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Fri Aug 17 11:12:13 2012
+EESchema-LIBRARY Version 2.3  Date: Fri Aug 17 13:08:20 2012
 #encoding utf-8
 #
 # BALUN-B0310J50100AHF
diff --git a/hardware/licorice/licorice.cmp b/hardware/licorice/licorice.cmp
index 94059bf7..df32b6f3 100644
--- a/hardware/licorice/licorice.cmp
+++ b/hardware/licorice/licorice.cmp
@@ -1,507 +1,521 @@
-Cmp-Mod V01 Created by CvPCB (2011-06-30 BZR 3033)-stable date = Sun Aug  5 23:03:12 2012
+Cmp-Mod V01 Created by CvPCB (2011-06-30 BZR 3033)-stable date = Fri Aug 17 13:04:44 2012
 
 BeginCmp
-TimeStamp = /501F4788;
+TimeStamp = /4FAECB99;
 Reference = C1;
 ValeurCmp = 33pF;
 IdModule  = GSG-0402;
 EndCmp
 
-BeginCmp
-TimeStamp = /501F457B;
-Reference = C2;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501EF768;
-Reference = C3;
-ValeurCmp = 47pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501EF782;
-Reference = C4;
-ValeurCmp = 47pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FAA1282;
-Reference = C5;
-ValeurCmp = 47pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F4793;
-Reference = C6;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F413C;
-Reference = C7;
-ValeurCmp = 10nF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F4517;
-Reference = C8;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F4150;
-Reference = C9;
-ValeurCmp = 10nF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F414A;
-Reference = C10;
-ValeurCmp = 10nF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F414C;
-Reference = C11;
-ValeurCmp = 10nF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F453C;
-Reference = C12;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F46D6;
-Reference = C13;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FB55FBB;
-Reference = C14;
-ValeurCmp = 100pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F416B;
-Reference = C15;
-ValeurCmp = 10nF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FAECB99;
-Reference = C16;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
 BeginCmp
 TimeStamp = /4FAECBA0;
-Reference = C17;
+Reference = C2;
 ValeurCmp = 10nF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FAECBB6;
-Reference = C18;
+Reference = C3;
 ValeurCmp = 33pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FAECBB5;
-Reference = C19;
+Reference = C4;
 ValeurCmp = 10nF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FAECBB9;
-Reference = C20;
+Reference = C5;
 ValeurCmp = 33pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FAECBBA;
-Reference = C21;
+Reference = C6;
 ValeurCmp = 10nF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FAEC78D;
-Reference = C22;
-ValeurCmp = 100pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501EF3D9;
-Reference = C23;
-ValeurCmp = 47pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F414E;
-Reference = C24;
-ValeurCmp = 10nF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F45F6;
-Reference = C25;
+TimeStamp = /501F4788;
+Reference = C7;
 ValeurCmp = 33pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /501F38B1;
-Reference = C26;
+TimeStamp = /501EF782;
+Reference = C8;
 ValeurCmp = 47pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FAA1577;
-Reference = C27;
+TimeStamp = /502B53A4;
+Reference = C9;
+ValeurCmp = 10nF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E6EFB;
+Reference = C10;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /501F46A8;
+Reference = C11;
 ValeurCmp = 33pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FAEC84D;
-Reference = C28;
+Reference = C12;
 ValeurCmp = 330pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FAEC853;
-Reference = C29;
+Reference = C13;
 ValeurCmp = 330pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FAEC8AD;
-Reference = C30;
+Reference = C14;
 ValeurCmp = 8p2;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FAEC8B0;
-Reference = C31;
+Reference = C15;
 ValeurCmp = 180pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /501F46BD;
-Reference = C32;
+TimeStamp = /501F4793;
+Reference = C16;
 ValeurCmp = 33pF;
 IdModule  = GSG-0402;
 EndCmp
 
-BeginCmp
-TimeStamp = /501F41B9;
-Reference = C33;
-ValeurCmp = 10nF;
-IdModule  = GSG-0402;
-EndCmp
-
 BeginCmp
 TimeStamp = /501F41BB;
-Reference = C34;
+Reference = C17;
 ValeurCmp = 10nF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FAA1579;
-Reference = C35;
+TimeStamp = /501F41B9;
+Reference = C18;
 ValeurCmp = 10nF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /501F454C;
-Reference = C36;
+TimeStamp = /502E6F8B;
+Reference = C19;
 ValeurCmp = 33pF;
 IdModule  = GSG-0402;
 EndCmp
 
-BeginCmp
-TimeStamp = /501F4169;
-Reference = C37;
-ValeurCmp = 10nF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FAA1578;
-Reference = C38;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F4173;
-Reference = C39;
-ValeurCmp = 10nF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F46A8;
-Reference = C40;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FAA157D;
-Reference = C41;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F3BC7;
-Reference = C42;
-ValeurCmp = 2.2nF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F4625;
-Reference = C43;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501EF311;
-Reference = C44;
-ValeurCmp = 47pF;
-IdModule  = GSG-0402;
-EndCmp
-
 BeginCmp
 TimeStamp = /501F41BD;
-Reference = C45;
+Reference = C20;
 ValeurCmp = 10nF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /501F45B9;
-Reference = C46;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F477D;
-Reference = C47;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FAA157E;
-Reference = C48;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F4613;
-Reference = C49;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501EF6A1;
-Reference = C50;
+TimeStamp = /501EF768;
+Reference = C21;
 ValeurCmp = 47pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /501EF6BA;
-Reference = C51;
-ValeurCmp = 47pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F4769;
-Reference = C52;
+TimeStamp = /502B4779;
+Reference = C22;
 ValeurCmp = 33pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FAECE69;
-Reference = C54;
-ValeurCmp = 33pF;
+TimeStamp = /502B4C6F;
+Reference = C23;
+ValeurCmp = 10nF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FAECE70;
-Reference = C55;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FAECE73;
-Reference = C56;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FAECE75;
-Reference = C57;
-ValeurCmp = 33pF;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FAA0C67;
-Reference = C58;
+TimeStamp = /502E6F11;
+Reference = C24;
 ValeurCmp = 33pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FAA149B;
-Reference = C59;
+Reference = C25;
 ValeurCmp = 47pF;
 IdModule  = GSG-0402;
 EndCmp
 
+BeginCmp
+TimeStamp = /501EF311;
+Reference = C26;
+ValeurCmp = 47pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502B477A;
+Reference = C27;
+ValeurCmp = 10nF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E6FEE;
+Reference = C28;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /4FAA0C67;
+Reference = C29;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502B56C2;
+Reference = C30;
+ValeurCmp = 10nF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502B571F;
+Reference = C31;
+ValeurCmp = 47pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502B4780;
+Reference = C32;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /4FAECE69;
+Reference = C33;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /4FAECE70;
+Reference = C34;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /4FAECE73;
+Reference = C35;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /4FAECE75;
+Reference = C36;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E792B;
+Reference = C37;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E78E2;
+Reference = C38;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E7922;
+Reference = C39;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
 BeginCmp
 TimeStamp = /4FB55FAD;
-Reference = C61;
+Reference = C40;
 ValeurCmp = 100pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FAEC781;
-Reference = C62;
+Reference = C41;
 ValeurCmp = 100pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FAA138A;
-Reference = C67;
+TimeStamp = /502B5738;
+Reference = C42;
+ValeurCmp = 47pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /501F4169;
+Reference = C43;
+ValeurCmp = 10nF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E6ECB;
+Reference = C44;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502B4C15;
+Reference = C45;
+ValeurCmp = 10nF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /501F477D;
+Reference = C46;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /501EF6BA;
+Reference = C47;
+ValeurCmp = 47pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E5F58;
+Reference = C48;
+ValeurCmp = 100pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /501EF6A1;
+Reference = C49;
+ValeurCmp = 47pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502C6D36;
+Reference = C50;
+ValeurCmp = 100pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502C6DB4;
+Reference = C51;
+ValeurCmp = 1uF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E6EB0;
+Reference = C52;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E7A10;
+Reference = C53;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E7A16;
+Reference = C54;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /501F4769;
+Reference = C55;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E5F55;
+Reference = C56;
+ValeurCmp = 100pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E665E;
+Reference = C57;
+ValeurCmp = 100pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E79FA;
+Reference = C58;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E6909;
+Reference = C59;
+ValeurCmp = 10nF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E6667;
+Reference = C60;
+ValeurCmp = 100pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E79CE;
+Reference = C61;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502C6D4A;
+Reference = C62;
+ValeurCmp = 10nF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E7989;
+Reference = C63;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /502E798C;
+Reference = C64;
+ValeurCmp = 33pF;
+IdModule  = GSG-0402;
+EndCmp
+
+BeginCmp
+TimeStamp = /4FAECD45;
+Reference = C65;
 ValeurCmp = 47pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FB2FD07;
-Reference = C69;
+Reference = C66;
 ValeurCmp = 100nF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FAECD45;
-Reference = C74;
-ValeurCmp = 47pF;
+TimeStamp = /502E7810;
+Reference = C67;
+ValeurCmp = 100nF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FB3CC76;
-Reference = C77;
+Reference = C68;
 ValeurCmp = 47pF;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FB3F7D4;
+TimeStamp = /4FB3F9B0;
 Reference = D1;
 ValeurCmp = GSG-DIODE-TVS-BI;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FB3F9B0;
-Reference = D2;
-ValeurCmp = GSG-DIODE-TVS-BI;
+TimeStamp = /502AFA8C;
+Reference = L1;
+ValeurCmp = DNP;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FAEC094;
-Reference = L1;
-ValeurCmp = 180nH;
-IdModule  = GSG-0603;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FB8333C;
+TimeStamp = /502B4BB2;
 Reference = L2;
 ValeurCmp = 180nH;
 IdModule  = GSG-0603;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FB546AD;
+TimeStamp = /502B4BB6;
 Reference = L3;
+ValeurCmp = 180nH;
+IdModule  = GSG-0603;
+EndCmp
+
+BeginCmp
+TimeStamp = /4FB55E30;
+Reference = L4;
 ValeurCmp = DNP;
 IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FAEC078;
-Reference = L4;
-ValeurCmp = 47nH;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FAEC066;
+TimeStamp = /502C6D12;
 Reference = L5;
-ValeurCmp = 47nH;
-IdModule  = GSG-0402;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FB55E30;
-Reference = L6;
-ValeurCmp = 3n3;
-IdModule  = GSG-0402;
+ValeurCmp = 180nH;
+IdModule  = GSG-0603;
 EndCmp
 
 BeginCmp
@@ -511,83 +525,83 @@ ValeurCmp = TX-IN;
 IdModule  = GSG-SMA-EDGE;
 EndCmp
 
-BeginCmp
-TimeStamp = /4F94D0F2;
-Reference = P2;
-ValeurCmp = TX/RX;
-IdModule  = GSG-SMA-EDGE;
-EndCmp
-
-BeginCmp
-TimeStamp = /4F94D0E4;
-Reference = P3;
-ValeurCmp = RX-only;
-IdModule  = GSG-SMA-EDGE;
-EndCmp
-
 BeginCmp
 TimeStamp = /4FB57544;
-Reference = P4;
+Reference = P2;
 ValeurCmp = SERIAL;
 IdModule  = GSG-HEADER-2x5;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FA9C5BB;
-Reference = P5;
+Reference = P3;
 ValeurCmp = RX-OUT;
 IdModule  = GSG-SMA-EDGE;
 EndCmp
 
+BeginCmp
+TimeStamp = /4F94D0F2;
+Reference = P4;
+ValeurCmp = ANTENNA;
+IdModule  = GSG-SMA-EDGE;
+EndCmp
+
 BeginCmp
 TimeStamp = /4FB3CC51;
-Reference = P6;
+Reference = P5;
 ValeurCmp = CLK;
 IdModule  = GSG-HEADER-1x2;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FB3CA54;
-Reference = P7;
+Reference = P6;
 ValeurCmp = SWITCH_CTRL;
 IdModule  = GSG-HEADER-2x7;
 EndCmp
 
 BeginCmp
 TimeStamp = /501F4DC6;
-Reference = P8;
+Reference = P7;
 ValeurCmp = VCC;
 IdModule  = GSG-HEADER-2x7;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FB81E54;
-Reference = P9;
+Reference = P8;
 ValeurCmp = CONN_1;
 IdModule  = GSG-HOLE-12MIL;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FB81E53;
-Reference = P10;
+Reference = P9;
 ValeurCmp = CONN_1;
 IdModule  = GSG-HOLE-12MIL;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FB81E51;
-Reference = P11;
+Reference = P10;
 ValeurCmp = CONN_1;
 IdModule  = GSG-HOLE-12MIL;
 EndCmp
 
 BeginCmp
 TimeStamp = /4FB81E45;
-Reference = P12;
+Reference = P11;
 ValeurCmp = CONN_1;
 IdModule  = GSG-HOLE-12MIL;
 EndCmp
 
+BeginCmp
+TimeStamp = /502E69D1;
+Reference = Q1;
+ValeurCmp = MOSFET_P;
+IdModule  = SOT23GDS;
+EndCmp
+
 BeginCmp
 TimeStamp = /4FAEC850;
 Reference = R1;
@@ -631,10 +645,10 @@ IdModule  = GSG-0402;
 EndCmp
 
 BeginCmp
-TimeStamp = /4FA9C4DF;
+TimeStamp = /501EF483;
 Reference = T1;
-ValeurCmp = TX_IF_BALUN;
-IdModule  = GSG-2500BL14M100;
+ValeurCmp = RX_BALUN;
+IdModule  = GSG-B0310J50100AHF;
 EndCmp
 
 BeginCmp
@@ -644,130 +658,116 @@ ValeurCmp = TX_BALUN;
 IdModule  = GSG-B0310J50100AHF;
 EndCmp
 
-BeginCmp
-TimeStamp = /501EF483;
-Reference = T3;
-ValeurCmp = RX_BALUN;
-IdModule  = GSG-B0310J50100AHF;
-EndCmp
-
-BeginCmp
-TimeStamp = /4FAA08F4;
-Reference = T8;
-ValeurCmp = RX_IF_BALUN;
-IdModule  = GSG-2500BL14M100;
-EndCmp
-
-BeginCmp
-TimeStamp = /4F957166;
-Reference = U1;
-ValeurCmp = RFFC5071;
-IdModule  = GSG-QFN32;
-EndCmp
-
 BeginCmp
 TimeStamp = /501EF778;
+Reference = U1;
+ValeurCmp = SKY13350;
+IdModule  = GSG-SKY13350-385LF;
+EndCmp
+
+BeginCmp
+TimeStamp = /502B490F;
 Reference = U2;
 ValeurCmp = SKY13350;
 IdModule  = GSG-SKY13350-385LF;
 EndCmp
 
 BeginCmp
-TimeStamp = /501F38E0;
+TimeStamp = /4F94D561;
 Reference = U3;
-ValeurCmp = SKY13350;
-IdModule  = GSG-SKY13350-385LF;
-EndCmp
-
-BeginCmp
-TimeStamp = /501EEFA1;
-Reference = U4;
-ValeurCmp = SKY13350;
-IdModule  = GSG-SKY13350-385LF;
-EndCmp
-
-BeginCmp
-TimeStamp = /4F94CF46;
-Reference = U5;
-ValeurCmp = TX_LOWPASS_FILTER;
+ValeurCmp = RX_LOWPASS_FILTER;
 IdModule  = GSG-LP0603;
 EndCmp
 
 BeginCmp
-TimeStamp = /501F3899;
+TimeStamp = /502BE21C;
+Reference = U4;
+ValeurCmp = RFFC5072;
+IdModule  = GSG-QFN32;
+EndCmp
+
+BeginCmp
+TimeStamp = /501F3B20;
+Reference = U5;
+ValeurCmp = SKY13350;
+IdModule  = GSG-SKY13350-385LF;
+EndCmp
+
+BeginCmp
+TimeStamp = /501EF258;
 Reference = U6;
 ValeurCmp = SKY13350;
 IdModule  = GSG-SKY13350-385LF;
 EndCmp
 
 BeginCmp
-TimeStamp = /501EF273;
+TimeStamp = /502B477E;
 Reference = U7;
 ValeurCmp = SKY13350;
 IdModule  = GSG-SKY13350-385LF;
 EndCmp
 
 BeginCmp
-TimeStamp = /4F94CF02;
+TimeStamp = /4F94D4F4;
 Reference = U8;
-ValeurCmp = TX_HIGHPASS_FILTER;
+ValeurCmp = RX_HIGHPASS_FILTER;
 IdModule  = GSG-HP-DEA;
 EndCmp
 
 BeginCmp
-TimeStamp = /501EF09F;
+TimeStamp = /502B5704;
 Reference = U9;
-ValeurCmp = SKY13350;
-IdModule  = GSG-SKY13350-385LF;
+ValeurCmp = SKY13317;
+IdModule  = GSG-SKY13317-373LF;
 EndCmp
 
 BeginCmp
-TimeStamp = /501F3B20;
+TimeStamp = /502B4C1C;
 Reference = U10;
 ValeurCmp = SKY13350;
 IdModule  = GSG-SKY13350-385LF;
 EndCmp
 
-BeginCmp
-TimeStamp = /4F94D4F4;
-Reference = U11;
-ValeurCmp = RX_HIGHPASS_FILTER;
-IdModule  = GSG-HP-DEA;
-EndCmp
-
-BeginCmp
-TimeStamp = /501EF258;
-Reference = U12;
-ValeurCmp = SKY13350;
-IdModule  = GSG-SKY13350-385LF;
-EndCmp
-
-BeginCmp
-TimeStamp = /4F94D561;
-Reference = U13;
-ValeurCmp = RX_LOWPASS_FILTER;
-IdModule  = GSG-LP0603;
-EndCmp
-
-BeginCmp
-TimeStamp = /501F3B60;
-Reference = U14;
-ValeurCmp = SKY13350;
-IdModule  = GSG-SKY13350-385LF;
-EndCmp
-
 BeginCmp
 TimeStamp = /501EF646;
-Reference = U15;
+Reference = U11;
 ValeurCmp = SKY13350;
 IdModule  = GSG-SKY13350-385LF;
 EndCmp
 
+BeginCmp
+TimeStamp = /502C6BDF;
+Reference = U12;
+ValeurCmp = SKY13317;
+IdModule  = GSG-SKY13317-373LF;
+EndCmp
+
+BeginCmp
+TimeStamp = /502DE480;
+Reference = U13;
+ValeurCmp = MGA-81563;
+IdModule  = GSG-SOT363;
+EndCmp
+
+BeginCmp
+TimeStamp = /502C6BE2;
+Reference = U14;
+ValeurCmp = SKY13317;
+IdModule  = GSG-SKY13317-373LF;
+EndCmp
+
 BeginCmp
 TimeStamp = /4FB2F586;
-Reference = U17;
+Reference = U15;
 ValeurCmp = GSG-74HC04;
 IdModule  = GSG-S-PVQFN-14;
 EndCmp
 
+BeginCmp
+TimeStamp = /502E7695;
+Reference = U16;
+ValeurCmp = GSG-74HC08;
+IdModule  = GSG-S-PVQFN-14;
+EndCmp
+
 EndListe
diff --git a/hardware/licorice/licorice.net b/hardware/licorice/licorice.net
index fda1557f..a26d83bd 100644
--- a/hardware/licorice/licorice.net
+++ b/hardware/licorice/licorice.net
@@ -1,315 +1,309 @@
-# EESchema Netlist Version 1.1 created  Sun Aug  5 23:03:12 2012
+# EESchema Netlist Version 1.1 created  Fri Aug 17 13:04:44 2012
 (
- ( /501F4788 GSG-0402 C1 33pF
-  ( 1 GND )
-  ( 2 /TX_BYPASS )
- )
- ( /501F457B GSG-0402 C2 33pF
-  ( 1 /TX_BYPASS )
-  ( 2 GND )
- )
- ( /501EF768 GSG-0402 C3 47pF
-  ( 1 N-000056 )
-  ( 2 N-000046 )
- )
- ( /501EF782 GSG-0402 C4 47pF
-  ( 1 N-000043 )
-  ( 2 N-000068 )
- )
- ( /4FAA1282 GSG-0402 C5 47pF
-  ( 1 N-000094 )
-  ( 2 N-000045 )
- )
- ( /501F4793 GSG-0402 C6 33pF
-  ( 1 GND )
-  ( 2 /!TX_BYPASS )
- )
- ( /501F413C GSG-0402 C7 10nF
-  ( 1 N-000089 )
-  ( 2 N-000003 )
- )
- ( /501F4517 GSG-0402 C8 33pF
-  ( 1 /!TX_BYPASS )
-  ( 2 GND )
- )
- ( /501F4150 GSG-0402 C9 10nF
-  ( 1 N-000044 )
-  ( 2 N-000027 )
- )
- ( /501F414A GSG-0402 C10 10nF
-  ( 1 N-000063 )
-  ( 2 N-000021 )
- )
- ( /501F414C GSG-0402 C11 10nF
-  ( 1 N-000022 )
-  ( 2 N-000064 )
- )
- ( /501F453C GSG-0402 C12 33pF
-  ( 1 /RX_LP )
-  ( 2 GND )
- )
- ( /501F46D6 GSG-0402 C13 33pF
-  ( 1 GND )
-  ( 2 /RX_LP )
- )
- ( /4FB55FBB GSG-0402 C14 100pF
-  ( 1 GND )
-  ( 2 VCC )
- )
- ( /501F416B GSG-0402 C15 10nF
-  ( 1 N-000033 )
-  ( 2 N-000034 )
- )
- ( /4FAECB99 GSG-0402 C16 33pF
+ ( /4FAECB99 GSG-0402 C1 33pF
   ( 1 VCC )
   ( 2 GND )
  )
- ( /4FAECBA0 GSG-0402 C17 10nF
+ ( /4FAECBA0 GSG-0402 C2 10nF
   ( 1 VCC )
   ( 2 GND )
  )
- ( /4FAECBB6 GSG-0402 C18 33pF
+ ( /4FAECBB6 GSG-0402 C3 33pF
   ( 1 VCC )
   ( 2 GND )
  )
- ( /4FAECBB5 GSG-0402 C19 10nF
+ ( /4FAECBB5 GSG-0402 C4 10nF
   ( 1 VCC )
   ( 2 GND )
  )
- ( /4FAECBB9 GSG-0402 C20 33pF
+ ( /4FAECBB9 GSG-0402 C5 33pF
   ( 1 VCC )
   ( 2 GND )
  )
- ( /4FAECBBA GSG-0402 C21 10nF
+ ( /4FAECBBA GSG-0402 C6 10nF
   ( 1 VCC )
   ( 2 GND )
  )
- ( /4FAEC78D GSG-0402 C22 100pF
+ ( /501F4788 GSG-0402 C7 33pF
   ( 1 GND )
-  ( 2 VCC )
+  ( 2 /MIX_BYPASS )
  )
- ( /501EF3D9 GSG-0402 C23 47pF
-  ( 1 N-000010 )
-  ( 2 N-000065 )
- )
- ( /501F414E GSG-0402 C24 10nF
-  ( 1 N-000024 )
-  ( 2 N-000023 )
- )
- ( /501F45F6 GSG-0402 C25 33pF
-  ( 1 /RX_HP )
-  ( 2 GND )
- )
- ( /501F38B1 GSG-0402 C26 47pF
-  ( 1 N-000066 )
-  ( 2 N-000026 )
- )
- ( /4FAA1577 GSG-0402 C27 33pF
-  ( 1 /TX_ANT )
-  ( 2 GND )
- )
- ( /4FAEC84D GSG-0402 C28 330pF
-  ( 1 N-000083 )
-  ( 2 GND )
- )
- ( /4FAEC853 GSG-0402 C29 330pF
-  ( 1 N-000082 )
-  ( 2 GND )
- )
- ( /4FAEC8AD GSG-0402 C30 8p2
-  ( 1 N-000081 )
-  ( 2 N-000087 )
- )
- ( /4FAEC8B0 GSG-0402 C31 180pF
-  ( 1 N-000081 )
-  ( 2 N-000080 )
- )
- ( /501F46BD GSG-0402 C32 33pF
-  ( 1 GND )
-  ( 2 /RX_HP )
- )
- ( /501F41B9 GSG-0402 C33 10nF
-  ( 1 N-000060 )
-  ( 2 N-000025 )
- )
- ( /501F41BB GSG-0402 C34 10nF
-  ( 1 N-000030 )
-  ( 2 N-000059 )
- )
- ( /4FAA1579 GSG-0402 C35 10nF
-  ( 1 N-000004 )
-  ( 2 N-000011 )
- )
- ( /501F454C GSG-0402 C36 33pF
-  ( 1 /TX_LP )
-  ( 2 GND )
- )
- ( /501F4169 GSG-0402 C37 10nF
-  ( 1 N-000001 )
-  ( 2 N-000019 )
- )
- ( /4FAA1578 GSG-0402 C38 33pF
-  ( 1 /!TX_ANT )
-  ( 2 GND )
- )
- ( /501F4173 GSG-0402 C39 10nF
-  ( 1 N-000031 )
-  ( 2 N-000032 )
- )
- ( /501F46A8 GSG-0402 C40 33pF
-  ( 1 GND )
-  ( 2 /TX_LP )
- )
- ( /4FAA157D GSG-0402 C41 33pF
-  ( 1 /!TX_ANT )
-  ( 2 GND )
- )
- ( /501F3BC7 GSG-0402 C42 2.2nF
-  ( 1 N-000088 )
+ ( /501EF782 GSG-0402 C8 47pF
+  ( 1 N-000054 )
   ( 2 N-000020 )
  )
- ( /501F4625 GSG-0402 C43 33pF
-  ( 1 /!RX_BYPASS )
-  ( 2 GND )
+ ( /502B53A4 GSG-0402 C9 10nF
+  ( 1 N-000016 )
+  ( 2 N-000003 )
  )
- ( /501EF311 GSG-0402 C44 47pF
-  ( 1 N-000002 )
-  ( 2 N-000062 )
- )
- ( /501F41BD GSG-0402 C45 10nF
-  ( 1 N-000028 )
-  ( 2 N-000029 )
- )
- ( /501F45B9 GSG-0402 C46 33pF
+ ( /502E6EFB GSG-0402 C10 33pF
   ( 1 GND )
-  ( 2 /TX_HP )
+  ( 2 /RX )
  )
- ( /501F477D GSG-0402 C47 33pF
+ ( /501F46A8 GSG-0402 C11 33pF
   ( 1 GND )
-  ( 2 /!RX_BYPASS )
+  ( 2 /LP )
  )
- ( /4FAA157E GSG-0402 C48 33pF
-  ( 1 /TX_ANT )
+ ( /4FAEC84D GSG-0402 C12 330pF
+  ( 1 N-000059 )
   ( 2 GND )
  )
- ( /501F4613 GSG-0402 C49 33pF
-  ( 1 /RX_BYPASS )
-  ( 2 GND )
- )
- ( /501EF6A1 GSG-0402 C50 47pF
+ ( /4FAEC853 GSG-0402 C13 330pF
   ( 1 N-000048 )
-  ( 2 N-000091 )
- )
- ( /501EF6BA GSG-0402 C51 47pF
-  ( 1 N-000067 )
-  ( 2 N-000047 )
- )
- ( /501F4769 GSG-0402 C52 33pF
-  ( 1 /RX_BYPASS )
   ( 2 GND )
  )
- ( /4FAECE69 GSG-0402 C54 33pF
+ ( /4FAEC8AD GSG-0402 C14 8p2
+  ( 1 N-000049 )
+  ( 2 N-000051 )
+ )
+ ( /4FAEC8B0 GSG-0402 C15 180pF
+  ( 1 N-000049 )
+  ( 2 N-000050 )
+ )
+ ( /501F4793 GSG-0402 C16 33pF
+  ( 1 /!MIX_BYPASS )
+  ( 2 GND )
+ )
+ ( /501F41BB GSG-0402 C17 10nF
+  ( 1 N-000056 )
+  ( 2 N-000072 )
+ )
+ ( /501F41B9 GSG-0402 C18 10nF
+  ( 1 N-000018 )
+  ( 2 N-000057 )
+ )
+ ( /502E6F8B GSG-0402 C19 33pF
+  ( 1 GND )
+  ( 2 /LP )
+ )
+ ( /501F41BD GSG-0402 C20 10nF
+  ( 1 N-000017 )
+  ( 2 N-000002 )
+ )
+ ( /501EF768 GSG-0402 C21 47pF
+  ( 1 N-000023 )
+  ( 2 N-000021 )
+ )
+ ( /502B4779 GSG-0402 C22 33pF
+  ( 1 GND )
+  ( 2 /RX )
+ )
+ ( /502B4C6F GSG-0402 C23 10nF
+  ( 1 N-000014 )
+  ( 2 N-000086 )
+ )
+ ( /502E6F11 GSG-0402 C24 33pF
+  ( 1 GND )
+  ( 2 /TX )
+ )
+ ( /4FAA149B GSG-0402 C25 47pF
+  ( 1 N-000060 )
+  ( 2 N-000024 )
+ )
+ ( /501EF311 GSG-0402 C26 47pF
+  ( 1 N-000074 )
+  ( 2 N-000073 )
+ )
+ ( /502B477A GSG-0402 C27 10nF
+  ( 1 N-000067 )
+  ( 2 N-000006 )
+ )
+ ( /502E6FEE GSG-0402 C28 33pF
+  ( 1 /HP )
+  ( 2 GND )
+ )
+ ( /4FAA0C67 GSG-0402 C29 33pF
+  ( 1 /HP )
+  ( 2 GND )
+ )
+ ( /502B56C2 GSG-0402 C30 10nF
+  ( 1 N-000009 )
+  ( 2 N-000008 )
+ )
+ ( /502B571F GSG-0402 C31 47pF
+  ( 1 N-000022 )
+  ( 2 N-000010 )
+ )
+ ( /502B4780 GSG-0402 C32 33pF
+  ( 1 /TX )
+  ( 2 GND )
+ )
+ ( /4FAECE69 GSG-0402 C33 33pF
   ( 1 /RESETX )
   ( 2 GND )
  )
- ( /4FAECE70 GSG-0402 C55 33pF
+ ( /4FAECE70 GSG-0402 C34 33pF
   ( 1 /ENX )
   ( 2 GND )
  )
- ( /4FAECE73 GSG-0402 C56 33pF
+ ( /4FAECE73 GSG-0402 C35 33pF
   ( 1 /SCLK )
   ( 2 GND )
  )
- ( /4FAECE75 GSG-0402 C57 33pF
+ ( /4FAECE75 GSG-0402 C36 33pF
   ( 1 /SDATA )
   ( 2 GND )
  )
- ( /4FAA0C67 GSG-0402 C58 33pF
-  ( 1 /TX_HP )
-  ( 2 GND )
+ ( /502E792B GSG-0402 C37 33pF
+  ( 1 GND )
+  ( 2 /!MIX_BYPASS )
  )
- ( /4FAA149B GSG-0402 C59 47pF
-  ( 1 N-000049 )
-  ( 2 N-000061 )
+ ( /502E78E2 GSG-0402 C38 33pF
+  ( 1 GND )
+  ( 2 /TX_MIX_BP )
  )
- ( /4FB55FAD GSG-0402 C61 100pF
+ ( /502E7922 GSG-0402 C39 33pF
+  ( 1 GND )
+  ( 2 /RX_MIX_BP )
+ )
+ ( /4FB55FAD GSG-0402 C40 100pF
   ( 1 VCC )
   ( 2 GND )
  )
- ( /4FAEC781 GSG-0402 C62 100pF
+ ( /4FAEC781 GSG-0402 C41 100pF
   ( 1 VCC )
   ( 2 GND )
  )
- ( /4FAA138A GSG-0402 C67 47pF
-  ( 1 N-000054 )
+ ( /502B5738 GSG-0402 C42 47pF
+  ( 1 N-000013 )
+  ( 2 N-000088 )
+ )
+ ( /501F4169 GSG-0402 C43 10nF
+  ( 1 N-000089 )
+  ( 2 N-000012 )
+ )
+ ( /502E6ECB GSG-0402 C44 33pF
+  ( 1 GND )
+  ( 2 /TX )
+ )
+ ( /502B4C15 GSG-0402 C45 10nF
+  ( 1 N-000007 )
+  ( 2 N-000069 )
+ )
+ ( /501F477D GSG-0402 C46 33pF
+  ( 1 GND )
+  ( 2 /!MIX_BYPASS )
+ )
+ ( /501EF6BA GSG-0402 C47 47pF
+  ( 1 N-000015 )
   ( 2 N-000055 )
  )
- ( /4FB2FD07 GSG-0402 C69 100nF
-  ( 1 VCC )
+ ( /502E5F58 GSG-0402 C48 100pF
+  ( 1 N-000100 )
+  ( 2 /RX_AMP_OUT )
+ )
+ ( /501EF6A1 GSG-0402 C49 47pF
+  ( 1 N-000070 )
+  ( 2 N-000071 )
+ )
+ ( /502C6D36 GSG-0402 C50 100pF
+  ( 1 N-000039 )
   ( 2 GND )
  )
- ( /4FAECD45 GSG-0402 C74 47pF
+ ( /502C6DB4 GSG-0402 C51 1uF
+  ( 1 N-000039 )
+  ( 2 GND )
+ )
+ ( /502E6EB0 GSG-0402 C52 33pF
+  ( 1 /RX )
+  ( 2 GND )
+ )
+ ( /502E7A10 GSG-0402 C53 33pF
+  ( 1 /AMP_BYPASS )
+  ( 2 GND )
+ )
+ ( /502E7A16 GSG-0402 C54 33pF
+  ( 1 /TX_AMP )
+  ( 2 GND )
+ )
+ ( /501F4769 GSG-0402 C55 33pF
+  ( 1 /MIX_BYPASS )
+  ( 2 GND )
+ )
+ ( /502E5F55 GSG-0402 C56 100pF
+  ( 1 /TX_AMP_OUT )
+  ( 2 N-000100 )
+ )
+ ( /502E665E GSG-0402 C57 100pF
+  ( 1 N-000090 )
+  ( 2 /TX_AMP_IN )
+ )
+ ( /502E79FA GSG-0402 C58 33pF
+  ( 1 GND )
+  ( 2 /AMP_BYPASS )
+ )
+ ( /502E6909 GSG-0402 C59 10nF
+  ( 1 N-000044 )
+  ( 2 N-000042 )
+ )
+ ( /502E6667 GSG-0402 C60 100pF
+  ( 1 /RX_AMP_IN )
+  ( 2 N-000090 )
+ )
+ ( /502E79CE GSG-0402 C61 33pF
+  ( 1 /TX_AMP )
+  ( 2 GND )
+ )
+ ( /502C6D4A GSG-0402 C62 10nF
+  ( 1 N-000046 )
+  ( 2 N-000087 )
+ )
+ ( /502E7989 GSG-0402 C63 33pF
+  ( 1 GND )
+  ( 2 /AMP_BYPASS )
+ )
+ ( /502E798C GSG-0402 C64 33pF
+  ( 1 GND )
+  ( 2 /AMP_BYPASS )
+ )
+ ( /4FAECD45 GSG-0402 C65 47pF
   ( 1 /CLK )
   ( 2 /REF_IN )
  )
- ( /4FB3CC76 GSG-0402 C77 47pF
+ ( /4FB2FD07 GSG-0402 C66 100nF
+  ( 1 VCC )
+  ( 2 GND )
+ )
+ ( /502E7810 GSG-0402 C67 100nF
+  ( 1 VCC )
+  ( 2 GND )
+ )
+ ( /4FB3CC76 GSG-0402 C68 47pF
   ( 1 /REF_IN )
   ( 2 GND )
  )
- ( /4FB3F7D4 GSG-0402 D1 GSG-DIODE-TVS-BI
+ ( /4FB3F9B0 GSG-0402 D1 GSG-DIODE-TVS-BI
   ( 1 GND )
-  ( 2 N-000011 )
+  ( 2 N-000087 )
  )
- ( /4FB3F9B0 GSG-0402 D2 GSG-DIODE-TVS-BI
-  ( 1 GND )
-  ( 2 N-000019 )
- )
- ( /4FAEC094 GSG-0603 L1 180nH
-  ( 1 VCC )
-  ( 2 N-000095 )
- )
- ( /4FB8333C GSG-0603 L2 180nH
-  ( 1 VCC )
-  ( 2 N-000018 )
- )
- ( /4FB546AD GSG-0402 L3 DNP
+ ( /502AFA8C GSG-0402 L1 DNP
   ( 1 N-000095 )
-  ( 2 N-000018 )
+  ( 2 N-000094 )
  )
- ( /4FAEC078 GSG-0402 L4 47nH
-  ( 1 N-000017 )
+ ( /502B4BB2 GSG-0603 L2 180nH
+  ( 1 N-000004 )
   ( 2 VCC )
  )
- ( /4FAEC066 GSG-0402 L5 47nH
-  ( 1 N-000092 )
+ ( /502B4BB6 GSG-0603 L3 180nH
+  ( 1 N-000068 )
   ( 2 VCC )
  )
- ( /4FB55E30 GSG-0402 L6 3n3
-  ( 1 N-000092 )
-  ( 2 N-000017 )
+ ( /4FB55E30 GSG-0402 L4 DNP
+  ( 1 N-000068 )
+  ( 2 N-000004 )
+ )
+ ( /502C6D12 GSG-0603 L5 180nH
+  ( 1 N-000039 )
+  ( 2 N-000100 )
  )
  ( /4FA9C5A4 GSG-SMA-EDGE P1 TX-IN
-  ( 1 N-000068 )
+  ( 1 N-000054 )
   ( 2 GND )
   ( 3 GND )
   ( 4 GND )
   ( 5 GND )
  )
- ( /4F94D0F2 GSG-SMA-EDGE P2 TX/RX
-  ( 1 N-000011 )
-  ( 2 GND )
-  ( 3 GND )
-  ( 4 GND )
-  ( 5 GND )
- )
- ( /4F94D0E4 GSG-SMA-EDGE P3 RX-only
-  ( 1 N-000019 )
-  ( 2 GND )
-  ( 3 GND )
-  ( 4 GND )
-  ( 5 GND )
- )
- ( /4FB57544 GSG-HEADER-2x5 P4 SERIAL
+ ( /4FB57544 GSG-HEADER-2x5 P2 SERIAL
   ( 1 /SDATA )
   ( 2 /SDATA )
   ( 3 /SCLK )
@@ -321,34 +315,41 @@
   ( 9 GND )
   ( 10 GND )
  )
- ( /4FA9C5BB GSG-SMA-EDGE P5 RX-OUT
-  ( 1 N-000067 )
+ ( /4FA9C5BB GSG-SMA-EDGE P3 RX-OUT
+  ( 1 N-000055 )
   ( 2 GND )
   ( 3 GND )
   ( 4 GND )
   ( 5 GND )
  )
- ( /4FB3CC51 GSG-HEADER-1x2 P6 CLK
+ ( /4F94D0F2 GSG-SMA-EDGE P4 ANTENNA
+  ( 1 N-000087 )
+  ( 2 GND )
+  ( 3 GND )
+  ( 4 GND )
+  ( 5 GND )
+ )
+ ( /4FB3CC51 GSG-HEADER-1x2 P5 CLK
   ( 1 GND )
   ( 2 /CLK )
  )
- ( /4FB3CA54 GSG-HEADER-2x7 P7 SWITCH_CTRL
-  ( 1 /TX_BYPASS )
+ ( /4FB3CA54 GSG-HEADER-2x7 P6 SWITCH_CTRL
+  ( 1 /MIX_BYPASS )
   ( 2 /GPO1 )
-  ( 3 /RX_BYPASS )
+  ( 3 /AMP_BYPASS )
   ( 4 /GPO2 )
-  ( 5 /TX_HP )
+  ( 5 /TX )
   ( 6 /GPO3 )
   ( 7 ? )
   ( 8 /GPO4 )
-  ( 9 /RX_HP )
+  ( 9 /HP )
   ( 10 /GPO5 )
-  ( 11 /TX_ANT )
+  ( 11 /!AMP_PWR )
   ( 12 /GPO6 )
   ( 13 GND )
   ( 14 GND )
  )
- ( /501F4DC6 GSG-HEADER-2x7 P8 VCC
+ ( /501F4DC6 GSG-HEADER-2x7 P7 VCC
   ( 1 GND )
   ( 2 VCC )
   ( 3 GND )
@@ -364,33 +365,38 @@
   ( 13 GND )
   ( 14 VCC )
  )
- ( /4FB81E54 GSG-HOLE-12MIL P9 CONN_1
+ ( /4FB81E54 GSG-HOLE-12MIL P8 CONN_1
   ( 1 ? )
  )
- ( /4FB81E53 GSG-HOLE-12MIL P10 CONN_1
+ ( /4FB81E53 GSG-HOLE-12MIL P9 CONN_1
   ( 1 ? )
  )
- ( /4FB81E51 GSG-HOLE-12MIL P11 CONN_1
+ ( /4FB81E51 GSG-HOLE-12MIL P10 CONN_1
   ( 1 ? )
  )
- ( /4FB81E45 GSG-HOLE-12MIL P12 CONN_1
+ ( /4FB81E45 GSG-HOLE-12MIL P11 CONN_1
   ( 1 ? )
  )
+ ( /502E69D1 SOT23GDS Q1 MOSFET_P
+  ( D N-000039 )
+  ( G /!AMP_PWR )
+  ( S VCC )
+ )
  ( /4FAEC850 GSG-0402 R1 470
-  ( 1 N-000082 )
-  ( 2 N-000083 )
+  ( 1 N-000048 )
+  ( 2 N-000059 )
  )
  ( /4FAEC856 GSG-0402 R2 470
-  ( 1 N-000081 )
-  ( 2 N-000082 )
+  ( 1 N-000049 )
+  ( 2 N-000048 )
  )
  ( /4FAEC8B2 GSG-0402 R3 22k
-  ( 1 N-000087 )
-  ( 2 N-000080 )
+  ( 1 N-000051 )
+  ( 2 N-000050 )
  )
  ( /4FAECC79 GSG-0402 R4 51k
   ( 1 GND )
-  ( 2 N-000086 )
+  ( 2 N-000047 )
  )
  ( /4FAECE50 GSG-0402 R5 4k7
   ( 1 VCC )
@@ -400,188 +406,196 @@
   ( 1 VCC )
   ( 2 /ENX )
  )
- ( /4FA9C4DF GSG-2500BL14M100 T1 TX_IF_BALUN
-  ( 1 N-000056 )
+ ( /501EF483 GSG-B0310J50100AHF T1 RX_BALUN
+  ( 1 N-000067 )
   ( 2 GND )
-  ( 3 N-000057 )
-  ( 4 N-000058 )
-  ( 5 GND )
- )
- ( /501EF4A4 GSG-B0310J50100AHF T2 TX_BALUN
-  ( 1 N-000024 )
-  ( 2 GND )
-  ( 3 N-000018 )
+  ( 3 N-000094 )
   ( 4 N-000095 )
  )
- ( /501EF483 GSG-B0310J50100AHF T3 RX_BALUN
-  ( 1 N-000028 )
+ ( /501EF4A4 GSG-B0310J50100AHF T2 TX_BALUN
+  ( 1 N-000069 )
   ( 2 GND )
-  ( 3 N-000041 )
-  ( 4 N-000009 )
+  ( 3 N-000068 )
+  ( 4 N-000004 )
  )
- ( /4FAA08F4 GSG-2500BL14M100 T8 RX_IF_BALUN
-  ( 1 N-000048 )
+ ( /501EF778 GSG-SKY13350-385LF U1 SKY13350
+  ( 1 /!MIX_BYPASS )
+  ( 2 N-000023 )
+  ( 3 GND )
+  ( 4 N-000022 )
+  ( 5 /MIX_BYPASS )
+  ( 6 N-000020 )
+ )
+ ( /502B490F GSG-SKY13350-385LF U2 SKY13350
+  ( 1 /RX )
+  ( 2 N-000003 )
+  ( 3 GND )
+  ( 4 N-000086 )
+  ( 5 /TX )
+  ( 6 N-000002 )
+ )
+ ( /4F94D561 GSG-LP0603 U3 RX_LOWPASS_FILTER
+  ( 1 N-000057 )
   ( 2 GND )
-  ( 3 N-000092 )
-  ( 4 N-000017 )
-  ( 5 GND )
+  ( 3 GND )
+  ( 4 N-000056 )
  )
- ( /4F957166 GSG-QFN32 U1 RFFC5071
+ ( /502BE21C GSG-QFN32 U4 RFFC5072
   ( 0 GND )
   ( 1 /GPO5 )
   ( 2 ? )
   ( 3 ? )
-  ( 4 N-000086 )
+  ( 4 N-000047 )
   ( 5 VCC )
-  ( 6 N-000087 )
-  ( 7 N-000081 )
-  ( 8 N-000083 )
+  ( 6 N-000051 )
+  ( 7 N-000049 )
+  ( 8 N-000059 )
   ( 9 /GPO6 )
   ( 10 /REF_IN )
   ( 11 ? )
   ( 12 GND )
-  ( 13 N-000058 )
-  ( 14 N-000057 )
+  ( 13 ? )
+  ( 14 ? )
   ( 15 /GPO1 )
   ( 16 /GPO2 )
-  ( 17 N-000095 )
-  ( 18 N-000018 )
+  ( 17 ? )
+  ( 18 ? )
   ( 19 VCC )
   ( 20 ? )
   ( 21 ? )
   ( 22 VCC )
-  ( 23 N-000009 )
-  ( 24 N-000041 )
+  ( 23 N-000095 )
+  ( 24 N-000094 )
   ( 25 /GPO3 )
   ( 26 /GPO4 )
-  ( 27 N-000017 )
-  ( 28 N-000092 )
+  ( 27 N-000004 )
+  ( 28 N-000068 )
   ( 29 /RESETX )
   ( 30 /ENX )
   ( 31 /SCLK )
   ( 32 /SDATA )
  )
- ( /501EF778 GSG-SKY13350-385LF U2 SKY13350
-  ( 1 /TX_BYPASS )
-  ( 2 N-000094 )
+ ( /501F3B20 GSG-SKY13350-385LF U5 SKY13350
+  ( 1 /LP )
+  ( 2 N-000018 )
   ( 3 GND )
-  ( 4 N-000046 )
-  ( 5 /!TX_BYPASS )
-  ( 6 N-000043 )
+  ( 4 N-000024 )
+  ( 5 /HP )
+  ( 6 N-000008 )
  )
- ( /501F38E0 GSG-SKY13350-385LF U3 SKY13350
-  ( 1 /!TX_BYPASS )
-  ( 2 N-000044 )
+ ( /501EF258 GSG-SKY13350-385LF U6 SKY13350
+  ( 1 /HP )
+  ( 2 N-000073 )
   ( 3 GND )
-  ( 4 N-000045 )
-  ( 5 /TX_BYPASS )
-  ( 6 N-000089 )
+  ( 4 N-000072 )
+  ( 5 /LP )
+  ( 6 N-000017 )
  )
- ( /501EEFA1 GSG-SKY13350-385LF U4 SKY13350
-  ( 1 /!TX_ANT )
-  ( 2 N-000033 )
-  ( 3 GND )
-  ( 4 N-000003 )
-  ( 5 /TX_ANT )
-  ( 6 N-000004 )
- )
- ( /4F94CF46 GSG-LP0603 U5 TX_LOWPASS_FILTER
-  ( 1 N-000063 )
-  ( 2 GND )
-  ( 3 GND )
-  ( 4 N-000064 )
- )
- ( /501F3899 GSG-SKY13350-385LF U6 SKY13350
-  ( 1 /RX_HP )
-  ( 2 N-000026 )
+ ( /502B477E GSG-SKY13350-385LF U7 SKY13350
+  ( 1 /RX )
+  ( 2 N-000016 )
   ( 3 GND )
   ( 4 N-000021 )
-  ( 5 /RX_LP )
-  ( 6 N-000027 )
+  ( 5 /TX )
+  ( 6 N-000006 )
  )
- ( /501EF273 GSG-SKY13350-385LF U7 SKY13350
-  ( 1 /RX_LP )
-  ( 2 N-000022 )
-  ( 3 GND )
-  ( 4 N-000010 )
-  ( 5 /RX_HP )
-  ( 6 N-000023 )
- )
- ( /4F94CF02 GSG-HP-DEA U8 TX_HIGHPASS_FILTER
-  ( 1 N-000065 )
+ ( /4F94D4F4 GSG-HP-DEA U8 RX_HIGHPASS_FILTER
+  ( 1 N-000074 )
   ( 2 GND )
-  ( 3 N-000066 )
+  ( 3 N-000060 )
   ( 4 GND )
  )
- ( /501EF09F GSG-SKY13350-385LF U9 SKY13350
-  ( 1 /!TX_ANT )
-  ( 2 N-000034 )
-  ( 3 GND )
-  ( 4 N-000001 )
-  ( 5 /TX_ANT )
-  ( 6 N-000032 )
- )
- ( /501F3B20 GSG-SKY13350-385LF U10 SKY13350
-  ( 1 /TX_HP )
-  ( 2 N-000049 )
-  ( 3 GND )
-  ( 4 N-000025 )
-  ( 5 /TX_LP )
-  ( 6 N-000088 )
- )
- ( /4F94D4F4 GSG-HP-DEA U11 RX_HIGHPASS_FILTER
-  ( 1 N-000061 )
-  ( 2 GND )
-  ( 3 N-000062 )
-  ( 4 GND )
- )
- ( /501EF258 GSG-SKY13350-385LF U12 SKY13350
-  ( 1 /TX_LP )
-  ( 2 N-000030 )
-  ( 3 GND )
-  ( 4 N-000002 )
-  ( 5 /TX_HP )
-  ( 6 N-000029 )
- )
- ( /4F94D561 GSG-LP0603 U13 RX_LOWPASS_FILTER
-  ( 1 N-000059 )
-  ( 2 GND )
-  ( 3 GND )
-  ( 4 N-000060 )
- )
- ( /501F3B60 GSG-SKY13350-385LF U14 SKY13350
-  ( 1 /RX_BYPASS )
-  ( 2 N-000055 )
-  ( 3 GND )
-  ( 4 N-000020 )
-  ( 5 /!RX_BYPASS )
-  ( 6 N-000031 )
- )
- ( /501EF646 GSG-SKY13350-385LF U15 SKY13350
-  ( 1 /!RX_BYPASS )
-  ( 2 N-000091 )
-  ( 3 GND )
-  ( 4 N-000054 )
-  ( 5 /RX_BYPASS )
-  ( 6 N-000047 )
- )
- ( /4FB2F586 GSG-S-PVQFN-14 U17 GSG-74HC04
+ ( /502B5704 GSG-SKY13317-373LF U9 SKY13317
   ( 0 GND )
-  ( 1 /TX_BYPASS )
-  ( 2 /!TX_BYPASS )
-  ( 3 /RX_BYPASS )
-  ( 4 /!RX_BYPASS )
-  ( 5 /TX_HP )
-  ( 6 /TX_LP )
+  ( 1 N-000012 )
+  ( 2 ? )
+  ( 3 /TX_MIX_BP )
+  ( 4 N-000010 )
+  ( 5 N-000009 )
+  ( 6 /!MIX_BYPASS )
+  ( 7 /RX_MIX_BP )
+  ( 8 N-000013 )
+ )
+ ( /502B4C1C GSG-SKY13350-385LF U10 SKY13350
+  ( 1 /RX )
+  ( 2 N-000071 )
+  ( 3 GND )
+  ( 4 N-000014 )
+  ( 5 /TX )
+  ( 6 N-000007 )
+ )
+ ( /501EF646 GSG-SKY13350-385LF U11 SKY13350
+  ( 1 /MIX_BYPASS )
+  ( 2 N-000088 )
+  ( 3 GND )
+  ( 4 N-000070 )
+  ( 5 /!MIX_BYPASS )
+  ( 6 N-000015 )
+ )
+ ( /502C6BDF GSG-SKY13317-373LF U12 SKY13317
+  ( 0 GND )
+  ( 1 N-000089 )
+  ( 2 ? )
+  ( 3 /AMP_BYPASS )
+  ( 4 N-000042 )
+  ( 5 /TX_AMP_IN )
+  ( 6 /TX_AMP )
+  ( 7 /AMP_BYPASS )
+  ( 8 /RX_AMP_OUT )
+ )
+ ( /502DE480 GSG-SOT363 U13 MGA-81563
+  ( 1 GND )
+  ( 2 GND )
+  ( 3 N-000090 )
+  ( 4 GND )
+  ( 5 GND )
+  ( 6 N-000100 )
+ )
+ ( /502C6BE2 GSG-SKY13317-373LF U14 SKY13317
+  ( 0 GND )
+  ( 1 N-000046 )
+  ( 2 ? )
+  ( 3 /TX_AMP )
+  ( 4 /TX_AMP_OUT )
+  ( 5 /RX_AMP_IN )
+  ( 6 /AMP_BYPASS )
+  ( 7 /AMP_BYPASS )
+  ( 8 N-000044 )
+ )
+ ( /4FB2F586 GSG-S-PVQFN-14 U15 GSG-74HC04
+  ( 0 GND )
+  ( 1 VCC )
+  ( 2 ? )
+  ( 3 /MIX_BYPASS )
+  ( 4 /!MIX_BYPASS )
+  ( 5 /AMP_BYPASS )
+  ( 6 /!AMP_BYPASS )
   ( 7 GND )
-  ( 8 /RX_LP )
-  ( 9 /RX_HP )
-  ( 10 /!TX_ANT )
-  ( 11 /TX_ANT )
+  ( 8 /LP )
+  ( 9 /HP )
+  ( 10 /RX )
+  ( 11 /TX )
   ( 12 ? )
   ( 13 VCC )
   ( 14 VCC )
  )
+ ( /502E7695 GSG-S-PVQFN-14 U16 GSG-74HC08
+  ( 0 GND )
+  ( 1 /MIX_BYPASS )
+  ( 2 /RX )
+  ( 3 /RX_MIX_BP )
+  ( 4 /MIX_BYPASS )
+  ( 5 /TX )
+  ( 6 /TX_MIX_BP )
+  ( 7 GND )
+  ( 8 /TX_AMP )
+  ( 9 /TX )
+  ( 10 /!AMP_BYPASS )
+  ( 11 /AMP_BYPASS )
+  ( 12 /RX )
+  ( 13 /!AMP_BYPASS )
+  ( 14 VCC )
+ )
 )
 *
 { Allowed footprints by component:
@@ -845,6 +859,11 @@ $component C52
  C?
  C1-1
 $endlist
+$component C53
+ SM*
+ C?
+ C1-1
+$endlist
 $component C54
  SM*
  C?
@@ -875,6 +894,11 @@ $component C59
  C?
  C1-1
 $endlist
+$component C60
+ SM*
+ C?
+ C1-1
+$endlist
 $component C61
  SM*
  C?
@@ -885,22 +909,32 @@ $component C62
  C?
  C1-1
 $endlist
+$component C63
+ SM*
+ C?
+ C1-1
+$endlist
+$component C64
+ SM*
+ C?
+ C1-1
+$endlist
+$component C65
+ SM*
+ C?
+ C1-1
+$endlist
+$component C66
+ SM*
+ C?
+ C1-1
+$endlist
 $component C67
  SM*
  C?
  C1-1
 $endlist
-$component C69
- SM*
- C?
- C1-1
-$endlist
-$component C74
- SM*
- C?
- C1-1
-$endlist
-$component C77
+$component C68
  SM*
  C?
  C1-1
@@ -910,11 +944,6 @@ $component D1
  SO*
  SM*
 $endlist
-$component D2
- D?
- SO*
- SM*
-$endlist
 $component R1
  R?
  SM0603
diff --git a/hardware/licorice/licorice.sch b/hardware/licorice/licorice.sch
index d3167a70..f0974c01 100644
--- a/hardware/licorice/licorice.sch
+++ b/hardware/licorice/licorice.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Fri Aug 17 11:12:13 2012
+EESchema Schematic File Version 2  date Fri Aug 17 13:08:20 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -46,837 +46,837 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	7200 7300 7200 7200
+	13300 8900 14000 8900
 Wire Wire Line
-	14000 8900 13150 8900
+	4450 3350 4350 3350
+Connection ~ 11700 7750
 Wire Wire Line
-	14000 8800 12900 8800
+	11700 7500 11700 8000
 Wire Wire Line
-	11850 7750 11700 7750
-Wire Wire Line
-	11400 8000 11700 8000
-Wire Wire Line
-	12350 7750 12250 7750
-Wire Wire Line
-	11700 7300 11600 7300
-Wire Wire Line
-	12200 7300 12100 7300
-Wire Wire Line
-	11600 7050 11600 7900
-Connection ~ 11600 7300
-Wire Wire Line
-	9900 8100 9900 8000
-Wire Wire Line
-	9900 8600 9900 8500
-Wire Wire Line
-	9500 8000 10300 8000
-Connection ~ 9900 8000
-Connection ~ 15300 8650
-Wire Wire Line
-	15300 8400 15300 8800
-Wire Wire Line
-	15900 8650 15800 8650
-Wire Wire Line
-	12700 8200 12700 8100
-Wire Wire Line
-	12400 5250 12400 5150
-Wire Wire Line
-	12950 5350 12950 5250
-Wire Wire Line
-	14850 5250 14850 5150
-Wire Wire Line
-	4400 9800 4800 9800
-Wire Wire Line
-	4400 9600 4800 9600
-Wire Wire Line
-	4400 9400 4800 9400
-Wire Wire Line
-	3200 9700 2800 9700
-Wire Wire Line
-	3200 9500 2800 9500
-Wire Wire Line
-	3200 9300 2800 9300
-Wire Wire Line
-	3200 9900 3100 9900
-Wire Wire Line
-	3100 9900 3100 10000
-Wire Wire Line
-	13250 5450 13250 5350
-Wire Wire Line
-	14550 5850 14550 6250
-Wire Wire Line
-	15100 9000 15200 9000
-Connection ~ 13050 3000
-Wire Wire Line
-	13050 2850 13050 3100
-Wire Wire Line
-	13650 3000 13550 3000
-Connection ~ 9550 3250
-Wire Wire Line
-	9400 3250 9550 3250
-Wire Wire Line
-	9250 3250 9250 3150
-Wire Wire Line
-	9250 3150 9450 3150
-Wire Wire Line
-	10250 2050 10150 2050
-Wire Wire Line
-	9650 2150 9650 1900
-Connection ~ 7100 6000
-Wire Wire Line
-	7200 6000 7100 6000
-Wire Wire Line
-	6400 7300 6500 7300
-Wire Wire Line
-	6900 7300 7000 7300
-Connection ~ 14950 6850
-Wire Wire Line
-	14950 6950 14950 6750
-Wire Wire Line
-	14600 6950 14600 6850
-Wire Wire Line
-	14950 6250 14950 6350
-Wire Wire Line
-	13300 6850 11500 6850
-Wire Wire Line
-	11500 6850 11500 7800
-Wire Wire Line
-	15200 7900 15200 8700
-Wire Wire Line
-	15200 7900 14300 7900
-Wire Wire Line
-	12800 8100 12600 8100
-Wire Wire Line
-	12800 8000 12700 8000
-Wire Wire Line
-	13800 8100 13700 8100
-Connection ~ 12700 8100
-Connection ~ 13800 7900
-Wire Wire Line
-	14550 8150 14550 8250
-Wire Wire Line
-	14600 7450 14600 7350
-Wire Wire Line
-	10300 7800 10200 7800
-Wire Wire Line
-	10200 7800 10200 6250
-Wire Wire Line
-	10200 6250 14550 6250
-Wire Wire Line
-	11500 7800 11400 7800
-Wire Wire Line
-	9700 7900 1950 7900
-Wire Wire Line
-	9700 7900 9700 5950
-Wire Wire Line
-	9700 5950 13250 5950
-Connection ~ 15700 9000
-Wire Wire Line
-	15600 9000 15800 9000
-Wire Wire Line
-	14450 5350 14550 5350
-Wire Wire Line
-	13250 5350 13350 5350
-Wire Wire Line
-	14550 4950 14550 5050
-Wire Wire Line
-	14550 5050 14450 5050
-Wire Wire Line
-	13250 4550 13250 4100
-Wire Wire Line
-	12950 3100 12950 2850
-Wire Wire Line
-	12950 2850 12750 2850
-Wire Wire Line
-	10550 4400 10350 4400
-Wire Wire Line
-	10350 4400 10350 4150
-Wire Wire Line
-	10550 2850 10450 2850
-Wire Wire Line
-	10450 2850 10450 3250
-Wire Wire Line
-	9750 3150 9650 3150
-Wire Wire Line
-	9650 3150 9650 3050
-Wire Wire Line
-	9550 2150 9550 1900
-Wire Wire Line
-	9450 3150 9450 3050
-Wire Wire Line
-	1250 7800 1350 7800
-Wire Wire Line
-	1250 6700 1350 6700
-Wire Wire Line
-	7100 7200 7100 7600
-Wire Wire Line
-	7100 7600 2450 7600
-Wire Wire Line
-	2450 7600 2450 7200
-Wire Wire Line
-	2050 1700 2050 1600
-Wire Wire Line
-	1750 2700 1850 2700
-Wire Wire Line
-	1850 1700 1850 1600
-Wire Wire Line
-	1850 1600 1750 1600
-Wire Wire Line
-	2050 2700 2050 2600
-Wire Wire Line
-	7200 6300 7200 6200
-Wire Wire Line
-	6400 6200 6500 6200
-Wire Wire Line
-	1950 3500 1950 4550
-Connection ~ 2750 3450
-Wire Wire Line
-	2750 3300 2750 3550
-Wire Wire Line
-	3350 3450 3250 3450
-Wire Wire Line
-	3250 4550 3350 4550
-Wire Wire Line
-	2650 5250 2650 5150
-Wire Wire Line
-	2650 4750 2650 4450
-Wire Wire Line
-	2550 4450 2550 4550
-Wire Wire Line
-	2550 3450 2550 3550
-Wire Wire Line
-	2500 4650 2650 4650
-Connection ~ 2650 4650
-Wire Wire Line
-	2750 4450 2750 4550
-Wire Wire Line
-	2750 4550 2850 4550
-Wire Wire Line
-	2850 3450 2750 3450
-Connection ~ 4150 4550
-Wire Wire Line
-	4450 3850 4350 3850
-Wire Wire Line
-	4350 3850 4350 4550
-Wire Wire Line
-	4350 4550 3950 4550
-Connection ~ 4150 3750
-Wire Wire Line
-	3950 4400 4050 4400
-Wire Wire Line
-	4050 4400 4050 3750
-Wire Wire Line
-	4050 3750 4450 3750
-Wire Wire Line
-	3250 4400 3350 4400
-Wire Wire Line
-	8100 9400 8100 9300
-Connection ~ 9850 9950
-Wire Wire Line
-	9850 9350 9850 10050
-Wire Wire Line
-	9850 10050 9750 10050
-Connection ~ 9850 9750
-Wire Wire Line
-	9850 9850 9750 9850
-Connection ~ 9850 9550
-Wire Wire Line
-	9850 9650 9750 9650
-Wire Wire Line
-	9850 9450 9750 9450
-Connection ~ 8850 9650
-Wire Wire Line
-	8950 9550 8850 9550
-Connection ~ 8850 9850
-Wire Wire Line
-	8850 9750 8950 9750
-Connection ~ 8850 10050
-Wire Wire Line
-	8850 9950 8950 9950
-Connection ~ 1850 2700
-Wire Wire Line
-	1850 2600 1850 3100
-Wire Wire Line
-	2050 1450 1950 1450
-Wire Wire Line
-	2550 1450 2450 1450
-Wire Wire Line
-	1950 1050 1950 1700
-Connection ~ 1950 1450
-Connection ~ 1950 6550
-Wire Wire Line
-	1950 6150 1950 6800
-Wire Wire Line
-	2550 6550 2450 6550
-Wire Wire Line
-	2050 6550 1950 6550
-Connection ~ 1850 7800
-Wire Wire Line
-	1750 7800 1850 7800
-Wire Wire Line
-	10450 2400 10350 2400
-Wire Wire Line
-	10950 4400 11050 4400
-Connection ~ 10250 4400
-Wire Wire Line
-	10100 4400 10250 4400
-Wire Wire Line
-	12250 4100 12350 4100
-Connection ~ 2200 9300
-Wire Wire Line
-	2100 9400 2200 9400
-Connection ~ 7650 5050
-Wire Wire Line
-	7650 5050 7650 4550
-Wire Wire Line
-	7650 4550 8950 4550
-Connection ~ 7850 4850
-Wire Wire Line
-	7850 4850 7850 4350
-Wire Wire Line
-	7850 4350 9150 4350
-Wire Wire Line
-	9150 4350 9150 4850
-Wire Wire Line
-	9150 4850 8750 4850
-Wire Wire Line
-	8850 5150 8850 4650
-Wire Wire Line
-	8850 5150 8750 5150
-Wire Wire Line
-	5900 9950 5500 9950
-Connection ~ 4650 5250
-Wire Wire Line
-	4650 5250 4350 5250
-Wire Wire Line
-	4350 5250 4350 5450
-Connection ~ 5550 6350
-Wire Wire Line
-	5550 6250 5550 6350
-Wire Wire Line
-	6750 4150 6850 4150
-Wire Wire Line
-	6850 4150 6850 4250
-Wire Wire Line
-	15700 9700 15700 9600
-Connection ~ 8350 9700
-Wire Wire Line
-	8600 9700 8350 9700
-Wire Wire Line
-	8350 9600 8350 9800
-Wire Wire Line
-	6700 10050 6800 10050
-Wire Wire Line
-	6800 10050 6800 10150
-Wire Wire Line
-	6700 9850 6900 9850
-Wire Wire Line
-	6700 9650 6900 9650
-Wire Wire Line
-	6700 9450 6900 9450
-Wire Wire Line
-	5500 9550 5900 9550
-Wire Wire Line
-	2100 9300 2450 9300
-Wire Wire Line
-	2100 9600 2250 9600
-Wire Wire Line
-	2100 9800 2250 9800
-Wire Wire Line
-	800  10000 800  9900
-Wire Wire Line
-	800  9900 900  9900
-Wire Wire Line
-	500  9700 900  9700
-Wire Wire Line
-	900  9500 500  9500
-Wire Wire Line
-	7350 4150 7350 4250
-Wire Wire Line
-	6050 5750 6050 5650
-Wire Wire Line
-	6650 5750 6650 5650
-Connection ~ 6650 4950
-Wire Wire Line
-	6650 5250 6650 4950
-Connection ~ 6050 5150
-Wire Wire Line
-	6050 5250 6050 5150
-Connection ~ 7150 5150
-Wire Wire Line
-	7150 5150 7150 4750
-Wire Wire Line
-	7950 5050 5750 5050
-Wire Wire Line
-	5750 5050 5750 4650
-Wire Wire Line
-	7950 4850 5950 4850
-Wire Wire Line
-	5650 2250 5650 2350
-Wire Wire Line
-	5850 2150 5850 2350
-Wire Wire Line
-	7050 3550 6750 3550
-Connection ~ 5750 800 
-Connection ~ 5200 800 
-Wire Wire Line
-	4800 700  4800 800 
-Connection ~ 5750 1200
-Connection ~ 5200 1200
-Wire Wire Line
-	4800 1300 4800 1200
-Connection ~ 8650 2150
-Wire Wire Line
-	8650 2250 8650 2150
-Wire Wire Line
-	8950 2750 8950 2650
-Wire Wire Line
-	8950 3250 8950 3350
-Wire Wire Line
-	8950 3350 6750 3350
-Wire Wire Line
-	7750 2750 7750 2650
-Connection ~ 7750 2150
-Wire Wire Line
-	7750 2250 7750 2150
-Connection ~ 7050 2150
-Wire Wire Line
-	7050 2250 7050 2150
-Connection ~ 4650 5350
-Wire Wire Line
-	4650 4950 4650 5450
-Wire Wire Line
-	5250 2350 5250 2150
-Wire Wire Line
-	5950 2350 5950 2150
-Wire Wire Line
-	5350 4650 5350 4850
-Connection ~ 4650 5050
-Wire Wire Line
-	4750 5350 4650 5350
-Connection ~ 5450 5050
-Wire Wire Line
-	5350 5050 5450 5050
-Connection ~ 16400 9300
-Wire Wire Line
-	16400 9200 16400 9600
-Connection ~ 16400 9500
-Wire Wire Line
-	10950 2550 11050 2550
-Wire Wire Line
-	12250 2550 12350 2550
-Wire Wire Line
-	12350 4400 12250 4400
-Connection ~ 650  2000
-Connection ~ 650  7100
-Wire Wire Line
-	6500 6350 6400 6350
-Connection ~ 650  7200
-Wire Wire Line
-	650  6900 650  7300
-Connection ~ 650  7000
-Connection ~ 650  2100
-Wire Wire Line
-	650  1800 650  2200
-Connection ~ 650  1900
-Wire Wire Line
-	5800 6350 5450 6350
-Wire Wire Line
-	4350 3650 4450 3650
-Wire Wire Line
-	10950 4100 11050 4100
-Connection ~ 16400 9400
-Wire Wire Line
-	4650 5050 4750 5050
-Wire Wire Line
-	5550 5350 5350 5350
-Connection ~ 5550 5350
-Wire Wire Line
-	5250 4650 5250 4850
-Wire Wire Line
-	6750 3850 6950 3850
-Wire Wire Line
-	5350 2350 5350 2150
-Wire Wire Line
-	5950 4850 5950 4650
-Wire Wire Line
-	4650 5950 4650 5850
-Wire Wire Line
-	6750 3150 6850 3150
-Wire Wire Line
-	6850 3150 6850 2150
-Wire Wire Line
-	6850 2150 7150 2150
-Wire Wire Line
-	7650 2150 7850 2150
-Wire Wire Line
-	7050 2750 7050 2650
-Wire Wire Line
-	6750 3250 8450 3250
-Wire Wire Line
-	8450 3250 8450 2150
-Wire Wire Line
-	8650 2650 8650 3350
-Connection ~ 8650 3350
-Wire Wire Line
-	8350 2150 8950 2150
-Wire Wire Line
-	8950 2150 8950 2250
-Connection ~ 8450 2150
-Wire Wire Line
-	6850 3450 6750 3450
-Connection ~ 4900 1200
-Connection ~ 5450 1200
-Wire Wire Line
-	4800 1200 6300 1200
-Connection ~ 6000 1200
-Connection ~ 4900 800 
-Connection ~ 5450 800 
-Wire Wire Line
-	4800 800  6300 800 
-Connection ~ 6000 800 
-Wire Wire Line
-	7650 3550 7550 3550
-Wire Wire Line
-	5850 4650 5850 4950
-Wire Wire Line
-	5850 4950 7950 4950
-Wire Wire Line
-	5650 4650 5650 5150
-Wire Wire Line
-	5650 5150 7950 5150
-Wire Wire Line
-	7150 4150 7150 4250
-Wire Wire Line
-	6350 5250 6350 5050
-Connection ~ 6350 5050
-Wire Wire Line
-	6950 5250 6950 4850
-Connection ~ 6950 4850
-Wire Wire Line
-	6950 5750 6950 5650
-Wire Wire Line
-	6350 5750 6350 5650
-Wire Wire Line
-	7350 5050 7350 4750
-Connection ~ 7350 5050
-Wire Wire Line
-	7850 5350 7850 5250
-Wire Wire Line
-	7850 5250 7950 5250
-Wire Wire Line
-	500  9600 900  9600
-Wire Wire Line
-	900  9800 500  9800
-Wire Wire Line
-	2100 9900 2250 9900
-Wire Wire Line
-	2100 9700 2250 9700
-Wire Wire Line
-	2450 9900 2450 9800
-Wire Wire Line
-	2450 9200 2450 9400
-Connection ~ 2450 9300
-Wire Wire Line
-	5900 9450 5500 9450
-Wire Wire Line
-	5900 9650 5500 9650
-Wire Wire Line
-	5900 9850 5500 9850
-Wire Wire Line
-	6700 9550 6900 9550
-Wire Wire Line
-	6700 9750 6900 9750
-Wire Wire Line
-	6700 9950 6900 9950
-Wire Wire Line
-	5900 10050 5800 10050
-Wire Wire Line
-	5800 10050 5800 10150
-Wire Wire Line
-	8350 10300 8350 10200
-Wire Wire Line
-	8350 9200 8350 9100
-Wire Wire Line
-	4350 5950 4350 5850
-Wire Wire Line
-	8850 5350 8850 5250
-Wire Wire Line
-	8850 5250 8750 5250
-Wire Wire Line
-	8750 5050 8950 5050
-Wire Wire Line
-	8950 5050 8950 4550
-Wire Wire Line
-	8750 4950 9050 4950
-Wire Wire Line
-	9050 4950 9050 4450
-Wire Wire Line
-	7750 4950 7750 4450
-Wire Wire Line
-	7750 4450 9050 4450
-Connection ~ 7750 4950
-Wire Wire Line
-	8850 4650 7550 4650
-Wire Wire Line
-	7550 4650 7550 5150
-Connection ~ 7550 5150
-Wire Wire Line
-	1500 10350 1500 10250
-Wire Wire Line
-	12350 2850 12250 2850
-Wire Wire Line
-	10250 4500 10250 4150
-Wire Wire Line
-	10250 5000 10250 4900
-Connection ~ 5550 5550
-Wire Wire Line
-	5550 5650 5550 4650
-Wire Wire Line
-	5450 6350 5450 4650
-Wire Wire Line
-	11050 2850 10950 2850
-Wire Wire Line
-	10950 2400 10850 2400
-Wire Wire Line
-	10350 2250 10350 3250
-Connection ~ 10350 2400
-Wire Wire Line
-	8850 10050 8950 10050
-Wire Wire Line
-	8850 9850 8950 9850
-Connection ~ 8850 9950
-Wire Wire Line
-	8850 9650 8950 9650
-Connection ~ 8850 9750
-Wire Wire Line
-	8850 10150 8850 9450
-Wire Wire Line
-	8850 9450 8950 9450
-Connection ~ 8850 9550
-Wire Wire Line
-	9850 9550 9750 9550
-Connection ~ 9850 9450
-Wire Wire Line
-	9850 9750 9750 9750
-Connection ~ 9850 9650
-Wire Wire Line
-	9750 9950 9850 9950
-Connection ~ 9850 9850
-Wire Wire Line
-	8350 9100 8000 9100
-Wire Wire Line
-	8100 9300 8000 9300
-Wire Wire Line
-	4150 3850 4150 3750
-Wire Wire Line
-	4150 4450 4150 4550
-Wire Wire Line
-	2650 3550 2650 1900
-Wire Wire Line
-	2650 1900 9050 1900
-Wire Wire Line
-	2550 4550 1950 4550
-Wire Wire Line
-	5550 5550 5700 5550
-Wire Wire Line
-	5700 5550 5700 6200
-Wire Wire Line
-	5700 6200 5800 6200
-Wire Wire Line
-	6900 6200 7000 6200
-Wire Wire Line
-	7000 6200 7000 6300
-Wire Wire Line
-	1950 3100 1950 2600
-Wire Wire Line
-	1250 1600 1350 1600
-Wire Wire Line
-	1250 2700 1350 2700
-Wire Wire Line
-	2050 6800 2050 6700
-Wire Wire Line
-	2050 6700 2450 6700
-Wire Wire Line
-	2450 6700 2450 6800
-Wire Wire Line
-	1750 6700 1850 6700
-Wire Wire Line
-	1850 6700 1850 6800
-Wire Wire Line
-	2050 7700 2050 7800
-Wire Wire Line
-	9550 1900 9450 1900
-Wire Wire Line
-	9450 2050 9450 2150
-Wire Wire Line
-	10150 3150 10250 3150
-Wire Wire Line
-	10250 3150 10250 3250
-Wire Wire Line
-	10450 4250 10450 4150
-Wire Wire Line
-	12850 3000 12850 3100
-Wire Wire Line
-	12750 4100 12850 4100
-Wire Wire Line
-	12850 4100 12850 4000
-Wire Wire Line
-	14550 4550 14550 1600
-Wire Wire Line
-	14550 1600 2050 1600
-Wire Wire Line
-	1950 7900 1950 7700
-Wire Wire Line
-	15700 9100 15700 9000
-Wire Wire Line
-	13250 4950 13250 5050
-Wire Wire Line
-	13250 5050 13350 5050
-Wire Wire Line
-	1850 7700 1850 8200
-Wire Wire Line
-	15200 8700 15100 8700
-Wire Wire Line
-	14950 7450 14950 7350
-Wire Wire Line
-	10850 8650 10850 8550
-Wire Wire Line
-	10200 8200 10200 8100
-Wire Wire Line
-	10200 8100 10300 8100
-Wire Wire Line
-	13900 4500 13900 4600
-Wire Wire Line
-	13800 8000 13700 8000
-Wire Wire Line
-	12700 7900 12800 7900
-Wire Wire Line
-	11400 8100 12200 8100
-Wire Wire Line
-	14000 8700 12700 8700
-Wire Wire Line
-	13900 7900 13700 7900
-Wire Wire Line
-	13800 7900 13800 6850
-Wire Wire Line
-	10200 8600 10200 9600
-Wire Wire Line
-	10200 9600 13900 9600
-Wire Wire Line
-	13900 9600 13900 9000
-Wire Wire Line
-	13900 9000 14000 9000
-Wire Wire Line
-	13900 6850 13700 6850
-Connection ~ 13800 6850
-Wire Wire Line
-	14950 6850 14500 6850
-Connection ~ 14600 6850
-Wire Wire Line
-	15250 6550 15600 6550
-Wire Wire Line
-	7000 7450 7000 7200
-Connection ~ 7000 7300
-Wire Wire Line
-	7100 6300 7100 5850
-Wire Wire Line
-	7700 6000 7600 6000
-Wire Wire Line
-	9750 2050 9650 2050
-Connection ~ 9650 2050
-Wire Wire Line
-	9550 3350 9550 3050
-Wire Wire Line
-	7200 6200 9250 6200
-Wire Wire Line
-	9250 6200 9250 3650
-Wire Wire Line
-	9550 3850 9550 3750
-Wire Wire Line
-	13150 3000 13050 3000
-Wire Wire Line
-	13250 4100 13050 4100
-Wire Wire Line
-	13050 4100 13050 4000
-Wire Wire Line
-	12950 4850 12950 4750
-Wire Wire Line
-	12950 4350 12950 4000
-Wire Wire Line
-	12800 4250 12950 4250
-Connection ~ 12950 4250
-Wire Wire Line
-	14550 5350 14550 5450
-Wire Wire Line
-	13250 5950 13250 5850
-Wire Wire Line
-	900  9300 800  9300
-Wire Wire Line
-	800  9300 800  9100
-Wire Wire Line
-	800  9100 2200 9100
-Wire Wire Line
-	2200 9100 2200 9400
-Wire Wire Line
-	3800 10350 3800 10250
-Wire Wire Line
-	2800 9400 3200 9400
-Wire Wire Line
-	2800 9600 3200 9600
-Wire Wire Line
-	3200 9800 2800 9800
-Wire Wire Line
-	4400 9500 4800 9500
-Wire Wire Line
-	4400 9700 4800 9700
-Wire Wire Line
-	4400 9900 4800 9900
-Connection ~ 5000 9300
-Wire Wire Line
-	5000 9200 5000 9400
-Wire Wire Line
-	5000 9900 5000 9800
-Wire Wire Line
-	4400 9300 5000 9300
-Wire Wire Line
-	14850 5750 14850 5650
-Wire Wire Line
-	14450 5150 15200 5150
-Connection ~ 14850 5150
-Wire Wire Line
-	12950 5850 12950 5750
-Wire Wire Line
-	12400 5750 12400 5650
-Wire Wire Line
-	12600 5250 13350 5250
-Connection ~ 12950 5250
-Wire Wire Line
-	13350 5150 12000 5150
-Connection ~ 12400 5150
-Connection ~ 13150 8800
-Connection ~ 13700 8900
-Wire Wire Line
-	13150 9400 13150 9300
-Wire Wire Line
-	13700 9500 13700 9400
-Wire Wire Line
-	13700 8900 13700 9000
-Wire Wire Line
-	13150 8900 13150 8800
-Wire Wire Line
-	12700 8700 12700 8600
-Wire Wire Line
-	15300 8800 15100 8800
+	11400 7900 11600 7900
 Wire Wire Line
 	15400 8650 15300 8650
 Wire Wire Line
-	11600 7900 11400 7900
+	15100 8800 15300 8800
 Wire Wire Line
-	11700 8000 11700 7500
-Connection ~ 11700 7750
+	12700 8600 12700 8700
 Wire Wire Line
-	4450 3350 4350 3350
+	13150 8900 13150 8800
+Wire Wire Line
+	13700 8900 13700 9000
+Wire Wire Line
+	13700 9500 13700 9400
+Wire Wire Line
+	13150 9400 13150 9300
+Connection ~ 13700 8900
+Connection ~ 13150 8800
+Connection ~ 12400 5150
+Wire Wire Line
+	12000 5150 13350 5150
+Connection ~ 12950 5250
+Wire Wire Line
+	13350 5250 12600 5250
+Wire Wire Line
+	12400 5750 12400 5650
+Wire Wire Line
+	12950 5850 12950 5750
+Connection ~ 14850 5150
+Wire Wire Line
+	15200 5150 14450 5150
+Wire Wire Line
+	14850 5750 14850 5650
+Wire Wire Line
+	4400 9300 5000 9300
+Wire Wire Line
+	5000 9900 5000 9800
+Wire Wire Line
+	5000 9400 5000 9200
+Connection ~ 5000 9300
+Wire Wire Line
+	4400 9900 4800 9900
+Wire Wire Line
+	4400 9700 4800 9700
+Wire Wire Line
+	4400 9500 4800 9500
+Wire Wire Line
+	3200 9800 2800 9800
+Wire Wire Line
+	2800 9600 3200 9600
+Wire Wire Line
+	2800 9400 3200 9400
+Wire Wire Line
+	3800 10350 3800 10250
+Wire Wire Line
+	2200 9100 2200 9400
+Wire Wire Line
+	2200 9100 800  9100
+Wire Wire Line
+	800  9100 800  9300
+Wire Wire Line
+	800  9300 900  9300
+Wire Wire Line
+	13250 5850 13250 5950
+Wire Wire Line
+	14550 5450 14550 5350
+Connection ~ 12950 4250
+Wire Wire Line
+	12800 4250 12950 4250
+Wire Wire Line
+	12950 4000 12950 4350
+Wire Wire Line
+	12950 4850 12950 4750
+Wire Wire Line
+	13050 4000 13050 4100
+Wire Wire Line
+	13050 4100 13250 4100
+Wire Wire Line
+	13150 3000 13050 3000
+Wire Wire Line
+	9550 3850 9550 3750
+Wire Wire Line
+	9250 3650 9250 6200
+Wire Wire Line
+	9250 6200 7200 6200
+Wire Wire Line
+	9550 3050 9550 3350
+Connection ~ 9650 2050
+Wire Wire Line
+	9750 2050 9650 2050
+Wire Wire Line
+	7700 6000 7600 6000
+Wire Wire Line
+	7100 5850 7100 6300
+Connection ~ 7000 7300
+Wire Wire Line
+	7000 7200 7000 7450
+Wire Wire Line
+	15250 6550 15600 6550
+Connection ~ 14600 6850
+Wire Wire Line
+	14500 6850 14950 6850
+Connection ~ 13800 6850
+Wire Wire Line
+	13700 6850 13900 6850
+Wire Wire Line
+	14000 9000 13900 9000
+Wire Wire Line
+	13900 9000 13900 9600
+Wire Wire Line
+	13900 9600 10200 9600
+Wire Wire Line
+	10200 9600 10200 8600
+Wire Wire Line
+	13800 6850 13800 7900
+Wire Wire Line
+	13700 7900 13900 7900
+Wire Wire Line
+	12700 8700 14000 8700
+Wire Wire Line
+	11400 8100 12200 8100
+Wire Wire Line
+	12700 7900 12800 7900
+Wire Wire Line
+	13800 8000 13700 8000
+Wire Wire Line
+	13900 4500 13900 4600
+Wire Wire Line
+	10300 8100 10200 8100
+Wire Wire Line
+	10200 8100 10200 8200
+Wire Wire Line
+	10850 8650 10850 8550
+Wire Wire Line
+	14950 7450 14950 7350
+Wire Wire Line
+	15100 8700 15200 8700
+Wire Wire Line
+	1850 8100 1850 7600
+Wire Wire Line
+	13350 5050 13250 5050
+Wire Wire Line
+	13250 5050 13250 4950
+Wire Wire Line
+	15700 9100 15700 9000
+Wire Wire Line
+	1950 7600 1950 7850
+Wire Wire Line
+	14550 1600 2050 1600
+Wire Wire Line
+	14550 1600 14550 4550
+Wire Wire Line
+	12850 4000 12850 4100
+Wire Wire Line
+	12850 4100 12750 4100
+Wire Wire Line
+	12850 3000 12850 3100
+Wire Wire Line
+	10450 4250 10450 4150
+Wire Wire Line
+	10250 3250 10250 3150
+Wire Wire Line
+	10250 3150 10150 3150
+Wire Wire Line
+	9450 2050 9450 2150
+Wire Wire Line
+	9450 1900 9550 1900
+Wire Wire Line
+	2050 7600 2050 7700
+Wire Wire Line
+	1850 6700 1850 6600
+Wire Wire Line
+	1850 6600 1750 6600
+Wire Wire Line
+	2450 6700 2450 6600
+Wire Wire Line
+	2450 6600 2050 6600
+Wire Wire Line
+	2050 6600 2050 6700
+Wire Wire Line
+	1250 2700 1350 2700
+Wire Wire Line
+	1250 1600 1350 1600
+Wire Wire Line
+	1950 3100 1950 2600
+Wire Wire Line
+	7000 6300 7000 6200
+Wire Wire Line
+	7000 6200 6900 6200
+Wire Wire Line
+	5800 6200 5700 6200
+Wire Wire Line
+	5700 6200 5700 5550
+Wire Wire Line
+	5700 5550 5550 5550
+Wire Wire Line
+	2550 4550 1950 4550
+Wire Wire Line
+	9050 1900 2650 1900
+Wire Wire Line
+	2650 1900 2650 3550
+Wire Wire Line
+	4150 4450 4150 4550
+Wire Wire Line
+	4150 3850 4150 3750
+Wire Wire Line
+	8000 9300 8100 9300
+Wire Wire Line
+	8000 9100 8350 9100
+Connection ~ 9850 9850
+Wire Wire Line
+	9750 9950 9850 9950
+Connection ~ 9850 9650
+Wire Wire Line
+	9850 9750 9750 9750
+Connection ~ 9850 9450
+Wire Wire Line
+	9850 9550 9750 9550
+Connection ~ 8850 9550
+Wire Wire Line
+	8950 9450 8850 9450
+Wire Wire Line
+	8850 9450 8850 10150
+Connection ~ 8850 9750
+Wire Wire Line
+	8850 9650 8950 9650
+Connection ~ 8850 9950
+Wire Wire Line
+	8850 9850 8950 9850
+Wire Wire Line
+	8850 10050 8950 10050
+Connection ~ 10350 2400
+Wire Wire Line
+	10350 3250 10350 2250
+Wire Wire Line
+	10950 2400 10850 2400
+Wire Wire Line
+	11050 2850 10950 2850
+Wire Wire Line
+	5450 4650 5450 6350
+Wire Wire Line
+	5550 4650 5550 5650
+Connection ~ 5550 5550
+Wire Wire Line
+	10250 5000 10250 4900
+Wire Wire Line
+	10250 4150 10250 4500
+Wire Wire Line
+	12350 2850 12250 2850
+Wire Wire Line
+	1500 10350 1500 10250
+Connection ~ 7550 5150
+Wire Wire Line
+	7550 5150 7550 4650
+Wire Wire Line
+	7550 4650 8850 4650
+Connection ~ 7750 4950
+Wire Wire Line
+	7750 4450 9050 4450
+Wire Wire Line
+	7750 4450 7750 4950
+Wire Wire Line
+	9050 4450 9050 4950
+Wire Wire Line
+	9050 4950 8750 4950
+Wire Wire Line
+	8950 5050 8950 4550
+Wire Wire Line
+	8950 5050 8750 5050
+Wire Wire Line
+	8750 5250 8850 5250
+Wire Wire Line
+	8850 5250 8850 5350
+Wire Wire Line
+	4350 5950 4350 5850
+Wire Wire Line
+	8350 9100 8350 9200
+Wire Wire Line
+	8350 10300 8350 10200
+Wire Wire Line
+	5800 10150 5800 10050
+Wire Wire Line
+	5800 10050 5900 10050
+Wire Wire Line
+	6700 9950 6900 9950
+Wire Wire Line
+	6700 9750 6900 9750
+Wire Wire Line
+	6700 9550 6900 9550
+Wire Wire Line
+	5900 9850 5500 9850
+Wire Wire Line
+	5900 9650 5500 9650
+Wire Wire Line
+	5900 9450 5500 9450
+Connection ~ 2450 9300
+Wire Wire Line
+	2450 9400 2450 9200
+Wire Wire Line
+	2450 9900 2450 9800
+Wire Wire Line
+	2100 9700 2250 9700
+Wire Wire Line
+	2100 9900 2250 9900
+Wire Wire Line
+	900  9800 500  9800
+Wire Wire Line
+	500  9600 900  9600
+Wire Wire Line
+	7950 5250 7850 5250
+Wire Wire Line
+	7850 5250 7850 5350
+Connection ~ 7350 5050
+Wire Wire Line
+	7350 5050 7350 4750
+Wire Wire Line
+	6350 5750 6350 5650
+Wire Wire Line
+	6950 5750 6950 5650
+Connection ~ 6950 4850
+Wire Wire Line
+	6950 5250 6950 4850
+Connection ~ 6350 5050
+Wire Wire Line
+	6350 5250 6350 5050
+Wire Wire Line
+	7150 4150 7150 4250
+Wire Wire Line
+	7950 5150 5650 5150
+Wire Wire Line
+	5650 5150 5650 4650
+Wire Wire Line
+	7950 4950 5850 4950
+Wire Wire Line
+	5850 4950 5850 4650
+Wire Wire Line
+	7650 3550 7550 3550
+Connection ~ 6000 800 
+Wire Wire Line
+	6300 800  4800 800 
+Connection ~ 5450 800 
+Connection ~ 4900 800 
+Connection ~ 6000 1200
+Wire Wire Line
+	6300 1200 4800 1200
+Connection ~ 5450 1200
+Connection ~ 4900 1200
+Wire Wire Line
+	6850 3450 6750 3450
+Connection ~ 8450 2150
+Wire Wire Line
+	8950 2250 8950 2150
+Wire Wire Line
+	8950 2150 8350 2150
+Connection ~ 8650 3350
+Wire Wire Line
+	8650 2650 8650 3350
+Wire Wire Line
+	8450 2150 8450 3250
+Wire Wire Line
+	8450 3250 6750 3250
+Wire Wire Line
+	7050 2750 7050 2650
+Wire Wire Line
+	7850 2150 7650 2150
+Wire Wire Line
+	7150 2150 6850 2150
+Wire Wire Line
+	6850 2150 6850 3150
+Wire Wire Line
+	6850 3150 6750 3150
+Wire Wire Line
+	4650 5950 4650 5850
+Wire Wire Line
+	5950 4650 5950 4850
+Wire Wire Line
+	5350 2350 5350 2150
+Wire Wire Line
+	6750 3850 6950 3850
+Wire Wire Line
+	5250 4650 5250 4850
+Connection ~ 5550 5350
+Wire Wire Line
+	5550 5350 5350 5350
+Wire Wire Line
+	4650 5050 4750 5050
+Connection ~ 16400 9400
+Wire Wire Line
+	10950 4100 11050 4100
+Wire Wire Line
+	4350 3650 4450 3650
+Wire Wire Line
+	5450 6350 5800 6350
+Connection ~ 650  1900
+Wire Wire Line
+	650  2200 650  1800
+Connection ~ 650  2100
+Connection ~ 650  6900
+Wire Wire Line
+	650  7200 650  6800
+Connection ~ 650  7100
+Wire Wire Line
+	6500 6350 6400 6350
+Connection ~ 650  7000
+Connection ~ 650  2000
+Wire Wire Line
+	12350 4400 12250 4400
+Wire Wire Line
+	12250 2550 12350 2550
+Wire Wire Line
+	10950 2550 11050 2550
+Connection ~ 16400 9500
+Wire Wire Line
+	16400 9600 16400 9200
+Connection ~ 16400 9300
+Wire Wire Line
+	5350 5050 5450 5050
+Connection ~ 5450 5050
+Wire Wire Line
+	4750 5350 4650 5350
+Connection ~ 4650 5050
+Wire Wire Line
+	5350 4650 5350 4850
+Wire Wire Line
+	5950 2350 5950 2150
+Wire Wire Line
+	5250 2350 5250 2150
+Wire Wire Line
+	4650 5450 4650 4950
+Connection ~ 4650 5350
+Wire Wire Line
+	7050 2250 7050 2150
+Connection ~ 7050 2150
+Wire Wire Line
+	7750 2250 7750 2150
+Connection ~ 7750 2150
+Wire Wire Line
+	7750 2750 7750 2650
+Wire Wire Line
+	6750 3350 8950 3350
+Wire Wire Line
+	8950 3350 8950 3250
+Wire Wire Line
+	8950 2750 8950 2650
+Wire Wire Line
+	8650 2250 8650 2150
+Connection ~ 8650 2150
+Wire Wire Line
+	4800 1200 4800 1300
+Connection ~ 5200 1200
+Connection ~ 5750 1200
+Wire Wire Line
+	4800 800  4800 700 
+Connection ~ 5200 800 
+Connection ~ 5750 800 
+Wire Wire Line
+	7050 3550 6750 3550
+Wire Wire Line
+	5850 2150 5850 2350
+Wire Wire Line
+	5650 2250 5650 2350
+Wire Wire Line
+	5950 4850 7950 4850
+Wire Wire Line
+	5750 4650 5750 5050
+Wire Wire Line
+	5750 5050 7950 5050
+Wire Wire Line
+	7150 5150 7150 4750
+Connection ~ 7150 5150
+Wire Wire Line
+	6050 5250 6050 5150
+Connection ~ 6050 5150
+Wire Wire Line
+	6650 5250 6650 4950
+Connection ~ 6650 4950
+Wire Wire Line
+	6650 5750 6650 5650
+Wire Wire Line
+	6050 5750 6050 5650
+Wire Wire Line
+	7350 4150 7350 4250
+Wire Wire Line
+	900  9500 500  9500
+Wire Wire Line
+	500  9700 900  9700
+Wire Wire Line
+	900  9900 800  9900
+Wire Wire Line
+	800  9900 800  10000
+Wire Wire Line
+	2100 9800 2250 9800
+Wire Wire Line
+	2100 9600 2250 9600
+Wire Wire Line
+	2450 9300 2100 9300
+Wire Wire Line
+	5500 9550 5900 9550
+Wire Wire Line
+	6700 9450 6900 9450
+Wire Wire Line
+	6700 9650 6900 9650
+Wire Wire Line
+	6700 9850 6900 9850
+Wire Wire Line
+	6800 10150 6800 10050
+Wire Wire Line
+	6800 10050 6700 10050
+Wire Wire Line
+	8350 9800 8350 9600
+Wire Wire Line
+	8600 9700 8350 9700
+Connection ~ 8350 9700
+Wire Wire Line
+	15700 9700 15700 9600
+Wire Wire Line
+	6850 4250 6850 4150
+Wire Wire Line
+	6850 4150 6750 4150
+Wire Wire Line
+	5550 6250 5550 6350
+Connection ~ 5550 6350
+Wire Wire Line
+	4350 5450 4350 5250
+Wire Wire Line
+	4350 5250 4650 5250
+Connection ~ 4650 5250
+Wire Wire Line
+	5900 9950 5500 9950
+Wire Wire Line
+	8750 5150 8850 5150
+Wire Wire Line
+	8850 5150 8850 4650
+Wire Wire Line
+	8750 4850 9150 4850
+Wire Wire Line
+	9150 4850 9150 4350
+Wire Wire Line
+	9150 4350 7850 4350
+Wire Wire Line
+	7850 4350 7850 4850
+Connection ~ 7850 4850
+Wire Wire Line
+	8950 4550 7650 4550
+Wire Wire Line
+	7650 4550 7650 5050
+Connection ~ 7650 5050
+Wire Wire Line
+	2200 9400 2100 9400
+Connection ~ 2200 9300
+Wire Wire Line
+	12250 4100 12350 4100
+Wire Wire Line
+	10100 4400 10250 4400
+Connection ~ 10250 4400
+Wire Wire Line
+	10950 4400 11050 4400
+Wire Wire Line
+	10450 2400 10350 2400
+Wire Wire Line
+	1750 7700 1850 7700
+Connection ~ 1850 7700
+Wire Wire Line
+	2050 6450 1950 6450
+Wire Wire Line
+	2550 6450 2450 6450
+Wire Wire Line
+	1950 6700 1950 6050
+Connection ~ 1950 6450
+Connection ~ 1950 1450
+Wire Wire Line
+	1950 1700 1950 1050
+Wire Wire Line
+	2550 1450 2450 1450
+Wire Wire Line
+	2050 1450 1950 1450
+Wire Wire Line
+	1850 3100 1850 2600
+Connection ~ 1850 2700
+Wire Wire Line
+	8850 9950 8950 9950
+Connection ~ 8850 10050
+Wire Wire Line
+	8850 9750 8950 9750
+Connection ~ 8850 9850
+Wire Wire Line
+	8950 9550 8850 9550
+Connection ~ 8850 9650
+Wire Wire Line
+	9850 9450 9750 9450
+Wire Wire Line
+	9850 9650 9750 9650
+Connection ~ 9850 9550
+Wire Wire Line
+	9850 9850 9750 9850
+Connection ~ 9850 9750
+Wire Wire Line
+	9750 10050 9850 10050
+Wire Wire Line
+	9850 10050 9850 9350
+Connection ~ 9850 9950
+Wire Wire Line
+	8100 9300 8100 9400
+Wire Wire Line
+	3250 4400 3350 4400
+Wire Wire Line
+	4450 3750 4050 3750
+Wire Wire Line
+	4050 3750 4050 4400
+Wire Wire Line
+	4050 4400 3950 4400
+Connection ~ 4150 3750
+Wire Wire Line
+	3950 4550 4350 4550
+Wire Wire Line
+	4350 4550 4350 3850
+Wire Wire Line
+	4350 3850 4450 3850
+Connection ~ 4150 4550
+Wire Wire Line
+	2850 3450 2750 3450
+Wire Wire Line
+	2850 4550 2750 4550
+Wire Wire Line
+	2750 4550 2750 4450
+Connection ~ 2650 4650
+Wire Wire Line
+	2500 4650 2650 4650
+Wire Wire Line
+	2550 3450 2550 3550
+Wire Wire Line
+	2550 4550 2550 4450
+Wire Wire Line
+	2650 4450 2650 4750
+Wire Wire Line
+	2650 5250 2650 5150
+Wire Wire Line
+	3250 4550 3350 4550
+Wire Wire Line
+	3350 3450 3250 3450
+Wire Wire Line
+	2750 3550 2750 3300
+Connection ~ 2750 3450
+Wire Wire Line
+	1950 4550 1950 3500
+Wire Wire Line
+	6400 6200 6500 6200
+Wire Wire Line
+	7200 6200 7200 6300
+Wire Wire Line
+	2050 2700 2050 2600
+Wire Wire Line
+	1750 1600 1850 1600
+Wire Wire Line
+	1850 1600 1850 1700
+Wire Wire Line
+	1750 2700 1850 2700
+Wire Wire Line
+	2050 1600 2050 1700
+Wire Wire Line
+	2450 7100 2450 7600
+Wire Wire Line
+	2450 7600 7100 7600
+Wire Wire Line
+	7100 7600 7100 7200
+Wire Wire Line
+	1250 6600 1350 6600
+Wire Wire Line
+	1250 7700 1350 7700
+Wire Wire Line
+	9450 3050 9450 3150
+Wire Wire Line
+	9550 1900 9550 2150
+Wire Wire Line
+	9650 3050 9650 3150
+Wire Wire Line
+	9650 3150 9750 3150
+Wire Wire Line
+	10450 3250 10450 2850
+Wire Wire Line
+	10450 2850 10550 2850
+Wire Wire Line
+	10350 4150 10350 4400
+Wire Wire Line
+	10350 4400 10550 4400
+Wire Wire Line
+	12750 2850 12950 2850
+Wire Wire Line
+	12950 2850 12950 3100
+Wire Wire Line
+	13250 4100 13250 4550
+Wire Wire Line
+	14450 5050 14550 5050
+Wire Wire Line
+	14550 5050 14550 4950
+Wire Wire Line
+	13350 5350 13250 5350
+Wire Wire Line
+	14550 5350 14450 5350
+Wire Wire Line
+	15800 9000 15600 9000
+Connection ~ 15700 9000
+Wire Wire Line
+	13250 5950 9700 5950
+Wire Wire Line
+	9700 5950 9700 7850
+Wire Wire Line
+	9700 7850 1950 7850
+Wire Wire Line
+	11400 7800 11500 7800
+Wire Wire Line
+	10200 6250 14550 6250
+Wire Wire Line
+	10200 6250 10200 7800
+Wire Wire Line
+	10200 7800 10300 7800
+Wire Wire Line
+	14600 7450 14600 7350
+Wire Wire Line
+	14550 8150 14550 8250
+Connection ~ 13800 7900
+Connection ~ 12700 8100
+Wire Wire Line
+	13800 8100 13700 8100
+Wire Wire Line
+	12800 8000 12700 8000
+Wire Wire Line
+	12600 8100 12800 8100
+Wire Wire Line
+	14300 7900 15200 7900
+Wire Wire Line
+	15200 7900 15200 8700
+Wire Wire Line
+	11500 7800 11500 6850
+Wire Wire Line
+	11500 6850 13300 6850
+Wire Wire Line
+	14950 6250 14950 6350
+Wire Wire Line
+	14600 6950 14600 6850
+Wire Wire Line
+	14950 6750 14950 6950
+Connection ~ 14950 6850
+Wire Wire Line
+	6900 7300 7000 7300
+Wire Wire Line
+	6400 7300 6500 7300
+Wire Wire Line
+	7200 6000 7100 6000
+Connection ~ 7100 6000
+Wire Wire Line
+	9650 1900 9650 2150
+Wire Wire Line
+	10250 2050 10150 2050
+Wire Wire Line
+	9450 3150 9250 3150
+Wire Wire Line
+	9250 3150 9250 3250
+Wire Wire Line
+	9400 3250 9550 3250
+Connection ~ 9550 3250
+Wire Wire Line
+	13650 3000 13550 3000
+Wire Wire Line
+	13050 3100 13050 2850
+Connection ~ 13050 3000
+Wire Wire Line
+	15100 9000 15200 9000
+Wire Wire Line
+	14550 6250 14550 5850
+Wire Wire Line
+	13250 5350 13250 5450
+Wire Wire Line
+	3100 10000 3100 9900
+Wire Wire Line
+	3100 9900 3200 9900
+Wire Wire Line
+	3200 9300 2800 9300
+Wire Wire Line
+	3200 9500 2800 9500
+Wire Wire Line
+	3200 9700 2800 9700
+Wire Wire Line
+	4400 9400 4800 9400
+Wire Wire Line
+	4400 9600 4800 9600
+Wire Wire Line
+	4400 9800 4800 9800
+Wire Wire Line
+	14850 5250 14850 5150
+Wire Wire Line
+	12950 5350 12950 5250
+Wire Wire Line
+	12400 5250 12400 5150
+Wire Wire Line
+	12700 8200 12700 8100
+Wire Wire Line
+	15900 8650 15800 8650
+Wire Wire Line
+	15300 8800 15300 8400
+Connection ~ 15300 8650
+Connection ~ 9900 8000
+Wire Wire Line
+	10300 8000 9500 8000
+Wire Wire Line
+	9900 8600 9900 8500
+Wire Wire Line
+	9900 8100 9900 8000
+Connection ~ 11600 7300
+Wire Wire Line
+	11600 7900 11600 7050
+Wire Wire Line
+	12200 7300 12100 7300
+Wire Wire Line
+	11700 7300 11600 7300
+Wire Wire Line
+	12350 7750 12250 7750
+Wire Wire Line
+	11700 8000 11400 8000
+Wire Wire Line
+	11850 7750 11700 7750
+Wire Wire Line
+	12900 8800 14000 8800
+Wire Wire Line
+	7200 7300 7200 7200
 $Comp
 L GND #PWR01
 U 1 1 502E7B4C
@@ -1325,6 +1325,9 @@ U 1 1 502E69D1
 P 15050 6550
 F 0 "Q1" H 15050 6740 60  0000 R CNN
 F 1 "MOSFET_P" H 15050 6370 60  0000 R CNN
+F 4 "Fairchild" H 15050 6550 60  0001 C CNN "Manufacturer"
+F 5 "BSS84" H 15050 6550 60  0001 C CNN "Part Number"
+F 6 "MOSFET P-CH 50V 130MA SOT-23" H 15050 6550 60  0001 C CNN "Description"
 	1    15050 6550
 	-1   0    0    1   
 $EndComp
@@ -1654,13 +1657,13 @@ $EndComp
 $Comp
 L C C47
 U 1 1 501EF6BA
-P 1550 6700
-F 0 "C47" H 1600 6800 50  0000 L CNN
-F 1 "47pF" H 1600 6600 50  0000 L CNN
-F 4 "Murata" H 3150 7800 60  0001 C CNN "Manufacturer"
-F 5 "GRM1555C1H470JZ01D" H 3150 7800 60  0001 C CNN "Part Number"
-F 6 "CAP CER 47PF 50V 5% NP0 0402" H 3150 7800 60  0001 C CNN "Description"
-	1    1550 6700
+P 1550 6600
+F 0 "C47" H 1600 6700 50  0000 L CNN
+F 1 "47pF" H 1600 6500 50  0000 L CNN
+F 4 "Murata" H 3150 7700 60  0001 C CNN "Manufacturer"
+F 5 "GRM1555C1H470JZ01D" H 3150 7700 60  0001 C CNN "Part Number"
+F 6 "CAP CER 47PF 50V 5% NP0 0402" H 3150 7700 60  0001 C CNN "Description"
+	1    1550 6600
 	0    1    1    0   
 $EndComp
 $Comp
@@ -1837,9 +1840,9 @@ F 1 "VCC" V 9350 9750 60  0000 C CNN
 	1    9350 9750
 	1    0    0    -1  
 $EndComp
-Text Label 1950 6150 3    40   ~ 0
+Text Label 1950 6050 3    40   ~ 0
 !MIX_BYPASS
-Text Label 1850 8200 1    40   ~ 0
+Text Label 1850 8100 1    40   ~ 0
 MIX_BYPASS
 Text Label 1850 3100 1    40   ~ 0
 !MIX_BYPASS
@@ -1894,43 +1897,43 @@ $EndComp
 $Comp
 L C C46
 U 1 1 501F477D
-P 2250 6550
-F 0 "C46" H 2300 6650 50  0000 L CNN
-F 1 "33pF" H 2300 6450 50  0000 L CNN
-F 4 "Murata" H 13600 8800 60  0001 C CNN "Manufacturer"
-F 5 "GRM1555C1H330JZ01D" H 13600 8800 60  0001 C CNN "Part Number"
-F 6 "CAP CER 33PF 50V 5% NP0 0402" H 13600 8800 60  0001 C CNN "Description"
-	1    2250 6550
+P 2250 6450
+F 0 "C46" H 2300 6550 50  0000 L CNN
+F 1 "33pF" H 2300 6350 50  0000 L CNN
+F 4 "Murata" H 13600 8700 60  0001 C CNN "Manufacturer"
+F 5 "GRM1555C1H330JZ01D" H 13600 8700 60  0001 C CNN "Part Number"
+F 6 "CAP CER 33PF 50V 5% NP0 0402" H 13600 8700 60  0001 C CNN "Description"
+	1    2250 6450
 	0    1    -1   0   
 $EndComp
 $Comp
 L GND #PWR039
 U 1 1 501F477C
-P 2550 6550
-F 0 "#PWR039" H 2550 6550 30  0001 C CNN
-F 1 "GND" H 2550 6480 30  0001 C CNN
-	1    2550 6550
+P 2550 6450
+F 0 "#PWR039" H 2550 6450 30  0001 C CNN
+F 1 "GND" H 2550 6380 30  0001 C CNN
+	1    2550 6450
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C55
 U 1 1 501F4769
-P 1550 7800
-F 0 "C55" H 1600 7900 50  0000 L CNN
-F 1 "33pF" H 1600 7700 50  0000 L CNN
-F 4 "Murata" H 4700 7600 60  0001 C CNN "Manufacturer"
-F 5 "GRM1555C1H330JZ01D" H 4700 7600 60  0001 C CNN "Part Number"
-F 6 "CAP CER 33PF 50V 5% NP0 0402" H 4700 7600 60  0001 C CNN "Description"
-	1    1550 7800
+P 1550 7700
+F 0 "C55" H 1600 7800 50  0000 L CNN
+F 1 "33pF" H 1600 7600 50  0000 L CNN
+F 4 "Murata" H 4700 7500 60  0001 C CNN "Manufacturer"
+F 5 "GRM1555C1H330JZ01D" H 4700 7500 60  0001 C CNN "Part Number"
+F 6 "CAP CER 33PF 50V 5% NP0 0402" H 4700 7500 60  0001 C CNN "Description"
+	1    1550 7700
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR040
 U 1 1 501F4768
-P 1250 7800
-F 0 "#PWR040" H 1250 7800 30  0001 C CNN
-F 1 "GND" H 1250 7730 30  0001 C CNN
-	1    1250 7800
+P 1250 7700
+F 0 "#PWR040" H 1250 7700 30  0001 C CNN
+F 1 "GND" H 1250 7630 30  0001 C CNN
+	1    1250 7700
 	0    1    1    0   
 $EndComp
 $Comp
@@ -2058,31 +2061,31 @@ $EndComp
 $Comp
 L C C49
 U 1 1 501EF6A1
-P 2450 7000
-F 0 "C49" H 2500 7100 50  0000 L CNN
-F 1 "47pF" H 2500 6900 50  0000 L CNN
-F 4 "Murata" H 4050 8100 60  0001 C CNN "Manufacturer"
-F 5 "GRM1555C1H470JZ01D" H 4050 8100 60  0001 C CNN "Part Number"
-F 6 "CAP CER 47PF 50V 5% NP0 0402" H 4050 8100 60  0001 C CNN "Description"
-	1    2450 7000
+P 2450 6900
+F 0 "C49" H 2500 7000 50  0000 L CNN
+F 1 "47pF" H 2500 6800 50  0000 L CNN
+F 4 "Murata" H 4050 8000 60  0001 C CNN "Manufacturer"
+F 5 "GRM1555C1H470JZ01D" H 4050 8000 60  0001 C CNN "Part Number"
+F 6 "CAP CER 47PF 50V 5% NP0 0402" H 4050 8000 60  0001 C CNN "Description"
+	1    2450 6900
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR043
 U 1 1 501EF65B
-P 2050 7800
-F 0 "#PWR043" H 2050 7800 30  0001 C CNN
-F 1 "GND" H 2050 7730 30  0001 C CNN
-	1    2050 7800
+P 2050 7700
+F 0 "#PWR043" H 2050 7700 30  0001 C CNN
+F 1 "GND" H 2050 7630 30  0001 C CNN
+	1    2050 7700
 	1    0    0    -1  
 $EndComp
 $Comp
 L SKY13350 U11
 U 1 1 501EF646
-P 1950 7250
-F 0 "U11" H 1950 7450 60  0000 C CNN
-F 1 "SKY13350" H 1950 7050 60  0000 C CNN
-	1    1950 7250
+P 1950 7150
+F 0 "U11" H 1950 7350 60  0000 C CNN
+F 1 "SKY13350" H 1950 6950 60  0000 C CNN
+	1    1950 7150
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -2973,10 +2976,10 @@ $EndComp
 $Comp
 L GND #PWR084
 U 1 1 4FAA08F7
-P 650 7300
-F 0 "#PWR084" H 650 7300 30  0001 C CNN
-F 1 "GND" H 650 7230 30  0001 C CNN
-	1    650  7300
+P 650 7200
+F 0 "#PWR084" H 650 7200 30  0001 C CNN
+F 1 "GND" H 650 7130 30  0001 C CNN
+	1    650  7200
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -2991,13 +2994,13 @@ $EndComp
 $Comp
 L GSG-SMA-CONN P3
 U 1 1 4FA9C5BB
-P 950 6700
-F 0 "P3" H 950 6850 60  0000 C CNN
-F 1 "RX-OUT" H 950 6550 60  0000 C CNN
-F 4 "Linx" H -14000 2300 60  0001 C CNN "Manufacturer"
-F 5 "CONSMA003.062" H -14000 2300 60  0001 C CNN "Part Number"
-F 6 "CONN FEMALE EDGE MT FOR .062\" BD" H -14000 2300 60  0001 C CNN "Description"
-	1    950  6700
+P 950 6600
+F 0 "P3" H 950 6750 60  0000 C CNN
+F 1 "RX-OUT" H 950 6450 60  0000 C CNN
+F 4 "Linx" H -14000 2200 60  0001 C CNN "Manufacturer"
+F 5 "CONSMA003.062" H -14000 2200 60  0001 C CNN "Part Number"
+F 6 "CONN FEMALE EDGE MT FOR .062\" BD" H -14000 2200 60  0001 C CNN "Description"
+	1    950  6600
 	1    0    0    -1  
 $EndComp
 $Comp