diff --git a/hardware/bubblegum/bubblegum-cache.lib b/hardware/bubblegum/bubblegum-cache.lib
index 6733a214..0916e769 100644
--- a/hardware/bubblegum/bubblegum-cache.lib
+++ b/hardware/bubblegum/bubblegum-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Sun Jul  8 10:32:41 2012
+EESchema-LIBRARY Version 2.3  Date: Wed Jul 11 17:40:53 2012
 #encoding utf-8
 #
 # BALUN
@@ -73,6 +73,18 @@ X ~ 2 0 -200 170 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
+# CONN_1
+#
+DEF ~CONN_1 P 0 30 N N 1 F N
+F0 "P" 80 0 40 H V L CNN
+F1 "CONN_1" 0 55 30 H I C CNN
+DRAW
+C 0 0 31 0 1 0 N
+P 2 0 1 0  -30 0  -50 0 N
+X 1 1 -150 0 100 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
 # CONN_2
 #
 DEF CONN_2 P 0 40 Y N 1 F N
diff --git a/hardware/bubblegum/bubblegum.brd b/hardware/bubblegum/bubblegum.brd
index 127ef041..cba41004 100644
--- a/hardware/bubblegum/bubblegum.brd
+++ b/hardware/bubblegum/bubblegum.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Wed Jul 11 17:30:57 2012
+PCBNEW-BOARD Version 1 date Wed Jul 11 17:42:47 2012
 
 # Created by Pcbnew(2011-06-30 BZR 3033)-stable
 
@@ -14,7 +14,7 @@ Ndraw 4
 Ntrack 34
 Nzone 0
 BoardThickness 630
-Nmodule 136
+Nmodule 140
 Nnets 93
 $EndGENERAL
 
@@ -139,51 +139,51 @@ Na 18 "N-000007"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 19 "N-000020"
+Na 19 "N-000008"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 20 "N-000026"
+Na 20 "N-000019"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 21 "N-000027"
+Na 21 "N-000021"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 22 "N-000029"
+Na 22 "N-000026"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 23 "N-000030"
+Na 23 "N-000027"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 24 "N-000031"
+Na 24 "N-000028"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 25 "N-000032"
+Na 25 "N-000029"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 26 "N-000034"
+Na 26 "N-000030"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 27 "N-000035"
+Na 27 "N-000031"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 28 "N-000036"
+Na 28 "N-000032"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 29 "N-000037"
+Na 29 "N-000033"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 30 "N-000038"
+Na 30 "N-000036"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -375,59 +375,59 @@ Na 77 "N-000085"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 78 "N-000086"
+Na 78 "N-000090"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 79 "N-000087"
+Na 79 "N-000091"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 80 "N-000088"
+Na 80 "N-000092"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 81 "N-000089"
+Na 81 "N-000094"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 82 "N-000090"
+Na 82 "N-000095"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 83 "N-000091"
+Na 83 "N-000096"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 84 "N-000092"
+Na 84 "N-000097"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 85 "N-000094"
+Na 85 "N-000098"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 86 "N-000095"
+Na 86 "N-000099"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 87 "N-000096"
+Na 87 "N-000100"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 88 "N-000097"
+Na 88 "N-000101"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 89 "N-000098"
+Na 89 "N-000102"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 90 "N-000099"
+Na 90 "N-000103"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 91 "N-000100"
+Na 91 "N-000104"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -462,18 +462,18 @@ AddNet "N-000004"
 AddNet "N-000005"
 AddNet "N-000006"
 AddNet "N-000007"
-AddNet "N-000020"
+AddNet "N-000008"
+AddNet "N-000019"
+AddNet "N-000021"
 AddNet "N-000026"
 AddNet "N-000027"
+AddNet "N-000028"
 AddNet "N-000029"
 AddNet "N-000030"
 AddNet "N-000031"
 AddNet "N-000032"
-AddNet "N-000034"
-AddNet "N-000035"
+AddNet "N-000033"
 AddNet "N-000036"
-AddNet "N-000037"
-AddNet "N-000038"
 AddNet "N-000039"
 AddNet "N-000040"
 AddNet "N-000041"
@@ -521,10 +521,6 @@ AddNet "N-000082"
 AddNet "N-000083"
 AddNet "N-000084"
 AddNet "N-000085"
-AddNet "N-000086"
-AddNet "N-000087"
-AddNet "N-000088"
-AddNet "N-000089"
 AddNet "N-000090"
 AddNet "N-000091"
 AddNet "N-000092"
@@ -535,6 +531,10 @@ AddNet "N-000097"
 AddNet "N-000098"
 AddNet "N-000099"
 AddNet "N-000100"
+AddNet "N-000101"
+AddNet "N-000102"
+AddNet "N-000103"
+AddNet "N-000104"
 AddNet "VCC"
 $EndNCLASS
 $MODULE SOT23-5
@@ -631,7 +631,7 @@ $PAD
 Sh "3" R 126 197 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "N-000038"
+Ne 19 "N-000008"
 Po 197 335
 Le -1381633
 $EndPAD
@@ -655,7 +655,7 @@ $PAD
 Sh "6" R 126 197 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "N-000038"
+Ne 19 "N-000008"
 Po -197 -335
 Le 65
 $EndPAD
@@ -694,7 +694,7 @@ $PAD
 Sh "3" R 126 197 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000032"
+Ne 29 "N-000033"
 Po 197 335
 Le -1381633
 $EndPAD
@@ -718,7 +718,7 @@ $PAD
 Sh "6" R 126 197 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000032"
+Ne 29 "N-000033"
 Po -197 -335
 Le 65
 $EndPAD
@@ -757,7 +757,7 @@ $PAD
 Sh "3" R 126 197 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 84 "N-000092"
+Ne 80 "N-000092"
 Po 197 335
 Le -1381633
 $EndPAD
@@ -781,7 +781,7 @@ $PAD
 Sh "6" R 126 197 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 84 "N-000092"
+Ne 80 "N-000092"
 Po -197 -335
 Le 65
 $EndPAD
@@ -820,7 +820,7 @@ $PAD
 Sh "3" R 126 197 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 37 "N-000045"
+Ne 79 "N-000091"
 Po 197 335
 Le -1381633
 $EndPAD
@@ -844,7 +844,7 @@ $PAD
 Sh "6" R 126 197 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 37 "N-000045"
+Ne 79 "N-000091"
 Po -197 -335
 Le 65
 $EndPAD
@@ -861,7 +861,7 @@ $PAD
 Sh "1" R 1600 600 0 0 1800
 Dr 0 0 0
 At SMD N 00808000
-Ne 36 "N-000044"
+Ne 37 "N-000045"
 Po 800 0
 Le 1431655764
 $EndPAD
@@ -959,7 +959,7 @@ $PAD
 Sh "1" R 1600 600 0 0 1800
 Dr 0 0 0
 At SMD N 00808000
-Ne 31 "N-000039"
+Ne 32 "N-000040"
 Po 800 0
 Le 1431655764
 $EndPAD
@@ -1264,7 +1264,7 @@ $PAD
 Sh "4" R 130 60 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 15 "N-000004"
+Ne 20 "N-000019"
 Po 191 98
 Le 20
 $EndPAD
@@ -1288,7 +1288,7 @@ $PAD
 Sh "2" R 130 60 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 16 "N-000005"
+Ne 15 "N-000004"
 Po -191 98
 Le 839724792
 $EndPAD
@@ -1388,7 +1388,7 @@ $PAD
 Sh "4" R 130 60 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 17 "N-000006"
+Ne 18 "N-000007"
 Po 191 98
 Le 20
 $EndPAD
@@ -1404,7 +1404,7 @@ $PAD
 Sh "6" R 79 201 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 74 "N-000082"
+Ne 16 "N-000005"
 Po 0 -157
 Le 41110432
 $EndPAD
@@ -1412,15 +1412,15 @@ $PAD
 Sh "2" R 130 60 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "N-000007"
+Ne 17 "N-000006"
 Po -191 98
 Le 839724792
 $EndPAD
 $EndMODULE  GSG-SKY13350-385LF
 $MODULE GSG-S-PVQFN-14
-Po 24000 21000 0 15 4FE0A018 4FFDD3A0 ~P
+Po 24000 21000 0 15 4FE0A018 4FFE0E89 ~P
 Li GSG-S-PVQFN-14
-Sc 4FFDD3A0
+Sc 4FFE0E89
 AR /4FE103CF
 Op 0 0 0
 .SolderMask 28
@@ -1657,7 +1657,7 @@ $PAD
 Sh "3" O 354 110 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 19 "N-000020"
+Ne 21 "N-000021"
 Po -965 -295
 Le -462864680
 $EndPAD
@@ -1665,7 +1665,7 @@ $PAD
 Sh "4" O 354 110 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 90 "N-000099"
+Ne 90 "N-000103"
 Po -965 -98
 Le 65
 $EndPAD
@@ -1673,7 +1673,7 @@ $PAD
 Sh "5" O 354 110 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 68 "N-000076"
+Ne 69 "N-000077"
 Po -965 98
 Le 49465328
 $EndPAD
@@ -1681,7 +1681,7 @@ $PAD
 Sh "6" O 354 110 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 89 "N-000098"
+Ne 88 "N-000101"
 Po -965 295
 Le 80
 $EndPAD
@@ -1867,7 +1867,7 @@ $PAD
 Sh "9" O 354 110 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 86 "N-000095"
+Ne 86 "N-000099"
 Po -689 965
 Le -451457960
 $EndPAD
@@ -1875,7 +1875,7 @@ $PAD
 Sh "10" O 354 110 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 80 "N-000088"
+Ne 78 "N-000090"
 Po -492 965
 Le 32
 $EndPAD
@@ -1915,7 +1915,7 @@ $PAD
 Sh "15" O 354 110 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "N-000027"
+Ne 84 "N-000097"
 Po 492 965
 Le 32
 $EndPAD
@@ -1923,7 +1923,7 @@ $PAD
 Sh "16" O 354 110 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 79 "N-000087"
+Ne 23 "N-000027"
 Po 689 965
 Le 32
 $EndPAD
@@ -1979,7 +1979,7 @@ $PAD
 Sh "23" O 354 110 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 88 "N-000097"
+Ne 67 "N-000075"
 Po 965 -492
 Le 4
 $EndPAD
@@ -2003,7 +2003,7 @@ $PAD
 Sh "26" O 354 110 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 64 "N-000072"
+Ne 66 "N-000074"
 Po 492 -965
 Le 286331153
 $EndPAD
@@ -2035,7 +2035,7 @@ $PAD
 Sh "30" O 354 110 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 73 "N-000081"
+Ne 70 "N-000078"
 Po -295 -965
 Le -462864616
 $EndPAD
@@ -2051,7 +2051,7 @@ $PAD
 Sh "32" O 354 110 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 91 "N-000100"
+Ne 91 "N-000104"
 Po -689 -965
 Le 50882848
 $EndPAD
@@ -2337,7 +2337,7 @@ Le 97
 $EndPAD
 $EndMODULE  GSG-HEADER-2x5
 $MODULE GSG-HEADER-2x5
-Po 33000 23750 0 15 4F8A601F 4FFDD3AA ~P
+Po 32000 23750 0 15 4F8A601F 4FFDD3AA ~P
 Li GSG-HEADER-2x5
 Kw CONN
 Sc 4FFDD3AA
@@ -2435,7 +2435,7 @@ Le 97
 $EndPAD
 $EndMODULE  GSG-HEADER-2x5
 $MODULE GSG-HEADER-2x5
-Po 33000 8750 0 15 4F8A601F 4FFDD3AC ~P
+Po 32000 8750 0 15 4F8A601F 4FFDD3AC ~P
 Li GSG-HEADER-2x5
 Kw CONN
 Sc 4FFDD3AC
@@ -2455,7 +2455,7 @@ $PAD
 Sh "1" R 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 89 "N-000098"
+Ne 88 "N-000101"
 Po -2000 500
 Le 33
 $EndPAD
@@ -2463,7 +2463,7 @@ $PAD
 Sh "2" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 89 "N-000098"
+Ne 88 "N-000101"
 Po -2000 -500
 Le 34735648
 $EndPAD
@@ -2471,7 +2471,7 @@ $PAD
 Sh "3" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 68 "N-000076"
+Ne 69 "N-000077"
 Po -1000 500
 Le 24
 $EndPAD
@@ -2479,7 +2479,7 @@ $PAD
 Sh "4" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 68 "N-000076"
+Ne 69 "N-000077"
 Po -1000 -500
 Le -1563238664
 $EndPAD
@@ -2487,7 +2487,7 @@ $PAD
 Sh "5" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 90 "N-000099"
+Ne 90 "N-000103"
 Po 0 500
 Le 48
 $EndPAD
@@ -2495,7 +2495,7 @@ $PAD
 Sh "6" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 90 "N-000099"
+Ne 90 "N-000103"
 Po 0 -500
 Le 48
 $EndPAD
@@ -2503,7 +2503,7 @@ $PAD
 Sh "7" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 19 "N-000020"
+Ne 21 "N-000021"
 Po 1000 500
 Le 48
 $EndPAD
@@ -2511,7 +2511,7 @@ $PAD
 Sh "8" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 19 "N-000020"
+Ne 21 "N-000021"
 Po 1000 -500
 Le 33
 $EndPAD
@@ -2519,7 +2519,7 @@ $PAD
 Sh "9" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 91 "N-000100"
+Ne 91 "N-000104"
 Po 2000 500
 Le 30841616
 $EndPAD
@@ -2527,7 +2527,7 @@ $PAD
 Sh "10" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 91 "N-000100"
+Ne 91 "N-000104"
 Po 2000 -500
 Le 97
 $EndPAD
@@ -2561,7 +2561,7 @@ $PAD
 Sh "2" C 600 600 0 0 900
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 67 "N-000075"
+Ne 68 "N-000076"
 Po 500 0
 Le 24
 $EndPAD
@@ -2583,7 +2583,7 @@ $PAD
 Sh "1" O 315 157 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 75 "N-000083"
+Ne 74 "N-000082"
 Po -591 -374
 Le 802751392
 $EndPAD
@@ -2591,7 +2591,7 @@ $PAD
 Sh "2" O 315 157 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 32 "N-000040"
+Ne 33 "N-000041"
 Po -591 0
 Le 273
 $EndPAD
@@ -2599,7 +2599,7 @@ $PAD
 Sh "3" O 315 157 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 26 "N-000034"
+Ne 31 "N-000039"
 Po -591 374
 Le 1
 $EndPAD
@@ -2623,7 +2623,7 @@ $PAD
 Sh "6" O 315 157 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 35 "N-000043"
+Ne 36 "N-000044"
 Po 591 -374
 Le 1
 $EndPAD
@@ -2653,7 +2653,7 @@ $PAD
 Sh "1" O 315 157 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 28 "N-000036"
+Ne 81 "N-000094"
 Po -591 -374
 Le 802751392
 $EndPAD
@@ -2661,7 +2661,7 @@ $PAD
 Sh "2" O 315 157 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 34 "N-000042"
+Ne 35 "N-000043"
 Po -591 0
 Le 273
 $EndPAD
@@ -2669,7 +2669,7 @@ $PAD
 Sh "3" O 315 157 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 33 "N-000041"
+Ne 34 "N-000042"
 Po -591 374
 Le 1
 $EndPAD
@@ -2685,7 +2685,7 @@ $PAD
 Sh "5" O 315 157 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "N-000091"
+Ne 39 "N-000047"
 Po 591 0
 Le 72
 $EndPAD
@@ -2693,7 +2693,7 @@ $PAD
 Sh "6" O 315 157 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 27 "N-000035"
+Ne 73 "N-000081"
 Po 591 -374
 Le 1
 $EndPAD
@@ -2739,7 +2739,7 @@ $PAD
 Sh "3" R 161 130 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 26 "N-000034"
+Ne 31 "N-000039"
 Po -260 -195
 Le 32750520
 $EndPAD
@@ -2747,7 +2747,7 @@ $PAD
 Sh "4" R 161 130 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 32 "N-000040"
+Ne 33 "N-000041"
 Po -260 195
 Le 6
 $EndPAD
@@ -2785,7 +2785,7 @@ $PAD
 Sh "1" R 161 130 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "N-000037"
+Ne 30 "N-000036"
 Po 260 -195
 Le 33054512
 $EndPAD
@@ -2801,7 +2801,7 @@ $PAD
 Sh "3" R 161 130 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 28 "N-000036"
+Ne 81 "N-000094"
 Po -260 -195
 Le 32750520
 $EndPAD
@@ -2809,7 +2809,7 @@ $PAD
 Sh "4" R 161 130 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 27 "N-000035"
+Ne 73 "N-000081"
 Po -260 195
 Le 6
 $EndPAD
@@ -2847,7 +2847,7 @@ $PAD
 Sh "1" R 98 217 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 36 "N-000044"
+Ne 37 "N-000045"
 Po -197 167
 Le 32
 $EndPAD
@@ -2863,7 +2863,7 @@ $PAD
 Sh "3" R 98 217 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 75 "N-000083"
+Ne 74 "N-000082"
 Po 197 167
 Le 343296
 $EndPAD
@@ -2871,7 +2871,7 @@ $PAD
 Sh "4" R 98 217 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 35 "N-000043"
+Ne 36 "N-000044"
 Po 197 -167
 Le 87
 $EndPAD
@@ -2909,7 +2909,7 @@ $PAD
 Sh "1" R 98 217 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 31 "N-000039"
+Ne 32 "N-000040"
 Po -197 167
 Le 32
 $EndPAD
@@ -2925,7 +2925,7 @@ $PAD
 Sh "3" R 98 217 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 33 "N-000041"
+Ne 34 "N-000042"
 Po 197 167
 Le 343296
 $EndPAD
@@ -2933,7 +2933,7 @@ $PAD
 Sh "4" R 98 217 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 34 "N-000042"
+Ne 35 "N-000043"
 Po 197 -167
 Le 87
 $EndPAD
@@ -2979,7 +2979,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 23 "N-000030"
+Ne 26 "N-000030"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3002,7 +3002,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 85 "N-000094"
+Ne 82 "N-000095"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3033,7 +3033,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 72 "N-000080"
+Ne 85 "N-000098"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3064,7 +3064,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 81 "N-000089"
+Ne 83 "N-000096"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3095,7 +3095,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 69 "N-000077"
+Ne 72 "N-000080"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3134,7 +3134,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 37 "N-000045"
+Ne 79 "N-000091"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3157,7 +3157,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 82 "N-000090"
+Ne 77 "N-000085"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3219,7 +3219,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 70 "N-000078"
+Ne 87 "N-000100"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3250,7 +3250,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 87 "N-000096"
+Ne 89 "N-000102"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3343,7 +3343,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 79 "N-000087"
+Ne 23 "N-000027"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3351,7 +3351,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "N-000027"
+Ne 84 "N-000097"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3374,7 +3374,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 20 "N-000026"
+Ne 24 "N-000028"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3382,7 +3382,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "N-000029"
+Ne 25 "N-000029"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3405,7 +3405,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 77 "N-000085"
+Ne 75 "N-000083"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3413,7 +3413,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 39 "N-000047"
+Ne 22 "N-000026"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3436,7 +3436,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 80 "N-000088"
+Ne 78 "N-000090"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3444,7 +3444,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 86 "N-000095"
+Ne 86 "N-000099"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3467,7 +3467,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 24 "N-000031"
+Ne 27 "N-000031"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3475,7 +3475,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 78 "N-000086"
+Ne 28 "N-000032"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3506,7 +3506,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 24 "N-000031"
+Ne 27 "N-000031"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3560,7 +3560,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 66 "N-000074"
+Ne 65 "N-000073"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3568,7 +3568,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 88 "N-000097"
+Ne 67 "N-000075"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3591,7 +3591,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 20 "N-000026"
+Ne 24 "N-000028"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3599,7 +3599,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 79 "N-000087"
+Ne 23 "N-000027"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3622,7 +3622,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 77 "N-000085"
+Ne 75 "N-000083"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3630,7 +3630,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 20 "N-000026"
+Ne 24 "N-000028"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3653,7 +3653,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 65 "N-000073"
+Ne 64 "N-000072"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3684,7 +3684,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "N-000029"
+Ne 25 "N-000029"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3692,7 +3692,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "N-000027"
+Ne 84 "N-000097"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3715,7 +3715,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 39 "N-000047"
+Ne 22 "N-000026"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3723,7 +3723,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "N-000029"
+Ne 25 "N-000029"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3746,7 +3746,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 70 "N-000078"
+Ne 87 "N-000100"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3754,7 +3754,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 79 "N-000087"
+Ne 23 "N-000027"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3777,7 +3777,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 70 "N-000078"
+Ne 87 "N-000100"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3785,7 +3785,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "N-000027"
+Ne 84 "N-000097"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3808,7 +3808,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 24 "N-000031"
+Ne 27 "N-000031"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3816,7 +3816,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 80 "N-000088"
+Ne 78 "N-000090"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3839,7 +3839,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 84 "N-000092"
+Ne 80 "N-000092"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3870,7 +3870,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 64 "N-000072"
+Ne 66 "N-000074"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3878,7 +3878,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 66 "N-000074"
+Ne 65 "N-000073"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3932,7 +3932,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 78 "N-000086"
+Ne 28 "N-000032"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3940,7 +3940,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 86 "N-000095"
+Ne 86 "N-000099"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3963,7 +3963,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 86 "N-000095"
+Ne 86 "N-000099"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -3971,7 +3971,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 87 "N-000096"
+Ne 89 "N-000102"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -3994,7 +3994,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 80 "N-000088"
+Ne 78 "N-000090"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4002,7 +4002,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 87 "N-000096"
+Ne 89 "N-000102"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4025,7 +4025,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 23 "N-000030"
+Ne 26 "N-000030"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4033,7 +4033,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 78 "N-000086"
+Ne 28 "N-000032"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4064,7 +4064,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "N-000038"
+Ne 19 "N-000008"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4087,7 +4087,7 @@ $PAD
 Sh "2" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000032"
+Ne 29 "N-000033"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4095,7 +4095,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "N-000091"
+Ne 39 "N-000047"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4118,7 +4118,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 73 "N-000081"
+Ne 70 "N-000078"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4126,7 +4126,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 67 "N-000075"
+Ne 68 "N-000076"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4281,7 +4281,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 84 "N-000092"
+Ne 80 "N-000092"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4312,7 +4312,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000032"
+Ne 29 "N-000033"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4366,7 +4366,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 23 "N-000030"
+Ne 26 "N-000030"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4397,7 +4397,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 87 "N-000096"
+Ne 89 "N-000102"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4428,7 +4428,7 @@ $PAD
 Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 73 "N-000081"
+Ne 70 "N-000078"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4521,7 +4521,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 64 "N-000072"
+Ne 66 "N-000074"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4552,7 +4552,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 64 "N-000072"
+Ne 66 "N-000074"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4560,7 +4560,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 65 "N-000073"
+Ne 64 "N-000072"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4583,7 +4583,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 66 "N-000074"
+Ne 65 "N-000073"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4614,7 +4614,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 88 "N-000097"
+Ne 67 "N-000075"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4746,7 +4746,7 @@ $PAD
 Sh "1" R 200 220 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 37 "N-000045"
+Ne 79 "N-000091"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4924,7 +4924,7 @@ $PAD
 Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 83 "N-000091"
+Ne 39 "N-000047"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -4932,7 +4932,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 39 "N-000047"
+Ne 22 "N-000026"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -4955,7 +4955,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 15 "N-000004"
+Ne 20 "N-000019"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -5110,7 +5110,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 87 "N-000096"
+Ne 89 "N-000102"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -5141,7 +5141,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 87 "N-000096"
+Ne 89 "N-000102"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -5211,7 +5211,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 69 "N-000077"
+Ne 72 "N-000080"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5242,7 +5242,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 69 "N-000077"
+Ne 72 "N-000080"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5273,7 +5273,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 69 "N-000077"
+Ne 72 "N-000080"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5304,7 +5304,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 82 "N-000090"
+Ne 77 "N-000085"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5335,7 +5335,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 82 "N-000090"
+Ne 77 "N-000085"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5366,7 +5366,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 81 "N-000089"
+Ne 83 "N-000096"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5397,7 +5397,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 81 "N-000089"
+Ne 83 "N-000096"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5420,7 +5420,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "N-000037"
+Ne 30 "N-000036"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -5428,7 +5428,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 74 "N-000082"
+Ne 16 "N-000005"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5459,7 +5459,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 85 "N-000094"
+Ne 82 "N-000095"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5490,7 +5490,7 @@ $PAD
 Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "N-000038"
+Ne 19 "N-000008"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5544,7 +5544,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 17 "N-000006"
+Ne 18 "N-000007"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -5707,7 +5707,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 72 "N-000080"
+Ne 85 "N-000098"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5738,7 +5738,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 77 "N-000085"
+Ne 75 "N-000083"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5792,7 +5792,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "N-000007"
+Ne 17 "N-000006"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -5831,7 +5831,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 70 "N-000078"
+Ne 87 "N-000100"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5862,7 +5862,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 70 "N-000078"
+Ne 87 "N-000100"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5893,7 +5893,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 70 "N-000078"
+Ne 87 "N-000100"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -5978,7 +5978,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 16 "N-000005"
+Ne 15 "N-000004"
 Po 210 0
 .SolderMask 40
 $EndPAD
@@ -6017,7 +6017,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 72 "N-000080"
+Ne 85 "N-000098"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -6048,7 +6048,7 @@ $PAD
 Sh "1" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 72 "N-000080"
+Ne 85 "N-000098"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -6172,7 +6172,7 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 85 "N-000094"
+Ne 82 "N-000095"
 Po -210 0
 Le 24791752
 .SolderMask 40
@@ -6203,12 +6203,84 @@ $PAD
 Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 85 "N-000094"
+Ne 82 "N-000095"
 Po -210 0
 Le 24791752
 .SolderMask 40
 $EndPAD
 $EndMODULE  GSG-0402
+$MODULE GSG-HOLE-12MIL
+Po 19000 23500 0 15 4FB81EE3 4FFE0F36 ~~
+Li GSG-HOLE-12MIL
+Kw DEV
+Sc 4FFE0F36
+AR /4FFE0EC5
+Op 0 0 0
+T0 0 -1200 400 400 0 100 N V 21 N "P9"
+T1 0 1100 400 400 0 100 N I 21 N "CONN_1"
+$PAD
+Sh "1" C 2250 2250 0 0 0
+Dr 1200 0 0
+At STD N 00C0FFFF
+Ne 0 ""
+Po 0 0
+Le 1416511272
+$EndPAD
+$EndMODULE  GSG-HOLE-12MIL
+$MODULE GSG-HOLE-12MIL
+Po 36500 23500 0 15 4FB81EE3 4FFE0F38 ~~
+Li GSG-HOLE-12MIL
+Kw DEV
+Sc 4FFE0F38
+AR /4FFE0ECC
+Op 0 0 0
+T0 0 -1200 400 400 0 100 N V 21 N "P10"
+T1 0 1100 400 400 0 100 N I 21 N "CONN_1"
+$PAD
+Sh "1" C 2250 2250 0 0 0
+Dr 1200 0 0
+At STD N 00C0FFFF
+Ne 0 ""
+Po 0 0
+Le 1416511272
+$EndPAD
+$EndMODULE  GSG-HOLE-12MIL
+$MODULE GSG-HOLE-12MIL
+Po 36500 9000 0 15 4FB81EE3 4FFE0F3A ~~
+Li GSG-HOLE-12MIL
+Kw DEV
+Sc 4FFE0F3A
+AR /4FFE0ED1
+Op 0 0 0
+T0 0 -1200 400 400 0 100 N V 21 N "P11"
+T1 0 1100 400 400 0 100 N I 21 N "CONN_1"
+$PAD
+Sh "1" C 2250 2250 0 0 0
+Dr 1200 0 0
+At STD N 00C0FFFF
+Ne 0 ""
+Po 0 0
+Le 1416511272
+$EndPAD
+$EndMODULE  GSG-HOLE-12MIL
+$MODULE GSG-HOLE-12MIL
+Po 19000 9000 0 15 4FB81EE3 4FFE0F3C ~~
+Li GSG-HOLE-12MIL
+Kw DEV
+Sc 4FFE0F3C
+AR /4FFE0ED3
+Op 0 0 0
+T0 0 -1200 400 400 0 100 N V 21 N "P12"
+T1 0 1100 400 400 0 100 N I 21 N "CONN_1"
+$PAD
+Sh "1" C 2250 2250 0 0 0
+Dr 1200 0 0
+At STD N 00C0FFFF
+Ne 0 ""
+Po 0 0
+Le 1416511272
+$EndPAD
+$EndMODULE  GSG-HOLE-12MIL
 $DRAWSEGMENT
 Po 0 17500 25000 17500 7500 150
 De 28 0 900 0 0
@@ -6254,46 +6326,46 @@ Po 0 33740 17040 33740 16710 60 -1
 De 15 0 12 0 0
 Po 0 33952 17252 33740 17040 60 -1
 De 15 0 12 0 0
-Po 0 33965 15492 34112 15492 60 -1
-De 15 0 64 0 400000
-Po 0 34240 16043 34712 16515 60 -1
-De 15 0 64 0 800000
-Po 0 34240 15620 34240 16043 60 -1
-De 15 0 64 0 0
-Po 0 34112 15492 34240 15620 60 -1
-De 15 0 64 0 0
-Po 0 34712 16865 34712 16515 60 -1
-De 15 0 64 0 C00000
-Po 0 35052 16855 34722 16855 60 -1
-De 15 0 64 0 400000
-Po 0 34722 16855 34712 16865 60 -1
-De 15 0 64 0 800000
 Po 0 33952 16855 34282 16855 60 -1
-De 15 0 65 0 400000
+De 15 0 64 0 400000
 Po 0 34282 16855 34292 16865 60 -1
-De 15 0 65 0 800000
+De 15 0 64 0 800000
 Po 0 34712 17265 35042 17265 60 -1
-De 15 0 66 0 400000
+De 15 0 65 0 400000
 Po 0 35042 17265 35052 17275 60 -1
-De 15 0 66 0 800000
+De 15 0 65 0 800000
 Po 0 35052 17275 35052 17555 60 -1
-De 15 0 66 0 400000
+De 15 0 65 0 400000
 Po 0 35052 17555 35112 17615 60 -1
+De 15 0 65 0 800000
+Po 0 33965 15492 34112 15492 60 -1
+De 15 0 66 0 400000
+Po 0 34240 16043 34712 16515 60 -1
+De 15 0 66 0 800000
+Po 0 34240 15620 34240 16043 60 -1
+De 15 0 66 0 0
+Po 0 34112 15492 34240 15620 60 -1
+De 15 0 66 0 0
+Po 0 34712 16865 34712 16515 60 -1
+De 15 0 66 0 C00000
+Po 0 35052 16855 34722 16855 60 -1
+De 15 0 66 0 400000
+Po 0 34722 16855 34712 16865 60 -1
 De 15 0 66 0 800000
 Po 0 34362 17615 34692 17615 60 -1
-De 15 0 88 0 C00000
+De 15 0 67 0 C00000
 Po 0 33492 15965 33492 16232 60 -1
-De 15 0 88 0 400000
+De 15 0 67 0 400000
 Po 0 34157 17820 34362 17615 60 -1
-De 15 0 88 0 800000
+De 15 0 67 0 800000
 Po 0 33790 17820 34157 17820 60 -1
-De 15 0 88 0 0
+De 15 0 67 0 0
 Po 0 33610 17640 33790 17820 60 -1
-De 15 0 88 0 0
+De 15 0 67 0 0
 Po 0 33610 16350 33610 17640 60 -1
-De 15 0 88 0 0
+De 15 0 67 0 0
 Po 0 33492 16232 33610 16350 60 -1
-De 15 0 88 0 0
+De 15 0 67 0 0
 $EndTRACK
 $ZONE
 $EndZONE
diff --git a/hardware/bubblegum/bubblegum.cmp b/hardware/bubblegum/bubblegum.cmp
index f880b9b4..d017741d 100644
--- a/hardware/bubblegum/bubblegum.cmp
+++ b/hardware/bubblegum/bubblegum.cmp
@@ -1,4 +1,4 @@
-Cmp-Mod V01 Created by CvPCB (2011-06-30 BZR 3033)-stable date = Wed Jul 11 13:24:50 2012
+Cmp-Mod V01 Created by CvPCB (2011-06-30 BZR 3033)-stable date = Wed Jul 11 17:41:38 2012
 
 BeginCmp
 TimeStamp = /4FE2B60A;
@@ -686,6 +686,34 @@ ValeurCmp = SWITCH_CTRL;
 IdModule  = GSG-HEADER-2x5;
 EndCmp
 
+BeginCmp
+TimeStamp = /4FFE0EC5;
+Reference = P9;
+ValeurCmp = CONN_1;
+IdModule  = GSG-HOLE-12MIL;
+EndCmp
+
+BeginCmp
+TimeStamp = /4FFE0ECC;
+Reference = P10;
+ValeurCmp = CONN_1;
+IdModule  = GSG-HOLE-12MIL;
+EndCmp
+
+BeginCmp
+TimeStamp = /4FFE0ED1;
+Reference = P11;
+ValeurCmp = CONN_1;
+IdModule  = GSG-HOLE-12MIL;
+EndCmp
+
+BeginCmp
+TimeStamp = /4FFE0ED3;
+Reference = P12;
+ValeurCmp = CONN_1;
+IdModule  = GSG-HOLE-12MIL;
+EndCmp
+
 BeginCmp
 TimeStamp = /4FF72E05;
 Reference = R1;
diff --git a/hardware/bubblegum/bubblegum.net b/hardware/bubblegum/bubblegum.net
index 1daa033e..a803d674 100644
--- a/hardware/bubblegum/bubblegum.net
+++ b/hardware/bubblegum/bubblegum.net
@@ -1,8 +1,8 @@
-# EESchema Netlist Version 1.1 created  Wed Jul 11 13:24:50 2012
+# EESchema Netlist Version 1.1 created  Wed Jul 11 17:41:38 2012
 (
  ( /4FE2B60A GSG-0402 C1 100pF
   ( 1 N-000062 )
-  ( 2 N-000005 )
+  ( 2 N-000004 )
  )
  ( /4FE2B678 GSG-0402 C2 33pF
   ( 1 /RX_HP )
@@ -13,7 +13,7 @@
   ( 2 GND )
  )
  ( /4FF0A552 GSG-0402 C4 100nF
-  ( 1 N-000045 )
+  ( 1 N-000091 )
   ( 2 GND )
  )
  ( /4FE10054 GSG-0402 C5 33pF
@@ -42,7 +42,7 @@
  )
  ( /4FE2B5F3 GSG-0402 C11 10nF
   ( 1 N-000061 )
-  ( 2 N-000004 )
+  ( 2 N-000019 )
  )
  ( /4FE0D23F GSG-0402 C12 10nF
   ( 1 N-000054 )
@@ -62,15 +62,15 @@
  )
  ( /4FE0F549 GSG-0402 C16 27pF
   ( 1 GND )
-  ( 2 N-000096 )
+  ( 2 N-000102 )
  )
  ( /4FE0F54B GSG-0402 C17 10nF
   ( 1 GND )
-  ( 2 N-000096 )
+  ( 2 N-000102 )
  )
  ( /4FE0F54D GSG-0402 C18 1uF
   ( 1 GND )
-  ( 2 N-000096 )
+  ( 2 N-000102 )
  )
  ( /4FE0D1D3 GSG-0402 C19 10nF
   ( 1 N-000056 )
@@ -93,7 +93,7 @@
   ( 2 GND )
  )
  ( /4FF0A543 GSG-0402 C24 100nF
-  ( 1 N-000032 )
+  ( 1 N-000033 )
   ( 2 GND )
  )
  ( /4FE0EDAC GSG-0402 C25 220pF
@@ -105,12 +105,12 @@
   ( 2 N-000030 )
  )
  ( /4FE0F7D1 GSG-0402 C27 22pF
-  ( 1 N-000075 )
-  ( 2 N-000081 )
+  ( 1 N-000076 )
+  ( 2 N-000078 )
  )
  ( /4FE0FB36 GSG-0402 C28 DNP
   ( 1 GND )
-  ( 2 N-000081 )
+  ( 2 N-000078 )
  )
  ( /4FE0D238 GSG-0402 C29 10nF
   ( 1 N-000053 )
@@ -122,26 +122,26 @@
  )
  ( /4FE0F802 GSG-0402 C31 47pF
   ( 1 GND )
-  ( 2 N-000072 )
+  ( 2 N-000074 )
  )
  ( /4FE0F809 GSG-0402 C32 560pF
-  ( 1 N-000073 )
-  ( 2 N-000072 )
+  ( 1 N-000072 )
+  ( 2 N-000074 )
  )
  ( /4FE0F822 GSG-0402 C33 4p7
   ( 1 GND )
-  ( 2 N-000074 )
+  ( 2 N-000073 )
  )
  ( /4FE0F827 GSG-0402 C34 DNP
   ( 1 GND )
-  ( 2 N-000097 )
+  ( 2 N-000075 )
  )
  ( /4FE0EEE4 GSG-0402 C35 220pF
-  ( 1 N-000047 )
-  ( 2 N-000091 )
+  ( 1 N-000026 )
+  ( 2 N-000047 )
  )
  ( /4FE0EEEA GSG-0402 C36 220pF
-  ( 1 N-000085 )
+  ( 1 N-000083 )
   ( 2 N-000048 )
  )
  ( /4FE2B993 GSG-0402 C37 33pF
@@ -150,18 +150,18 @@
  )
  ( /4FE2B803 GSG-0402 C38 100pF
   ( 1 N-000068 )
-  ( 2 N-000007 )
+  ( 2 N-000006 )
  )
  ( /4FE0F5F9 GSG-0402 C39 27pF
-  ( 1 N-000078 )
+  ( 1 N-000100 )
   ( 2 GND )
  )
  ( /4FE0F5F7 GSG-0402 C40 10nF
-  ( 1 N-000078 )
+  ( 1 N-000100 )
   ( 2 GND )
  )
  ( /4FE0F5E4 GSG-0402 C41 1uF
-  ( 1 N-000078 )
+  ( 1 N-000100 )
   ( 2 GND )
  )
  ( /4FE0FF74 GSG-0402 C42 33pF
@@ -173,15 +173,15 @@
   ( 2 N-000065 )
  )
  ( /4FE0F6DC GSG-0402 C44 27pF
-  ( 1 N-000080 )
+  ( 1 N-000098 )
   ( 2 GND )
  )
  ( /4FE0F6E6 GSG-0402 C45 10nF
-  ( 1 N-000080 )
+  ( 1 N-000098 )
   ( 2 GND )
  )
  ( /4FE0F6F0 GSG-0402 C46 1uF
-  ( 1 N-000080 )
+  ( 1 N-000098 )
   ( 2 GND )
  )
  ( /4FE0F6F3 GSG-0402 C47 4.7pF
@@ -197,55 +197,55 @@
   ( 2 GND )
  )
  ( /4FE0F719 GSG-0402 C50 4.7pF
-  ( 1 N-000094 )
+  ( 1 N-000095 )
   ( 2 GND )
  )
  ( /4FE0F71A GSG-0402 C51 10nF
-  ( 1 N-000094 )
+  ( 1 N-000095 )
   ( 2 GND )
  )
  ( /4FE0F72E GSG-0402 C52 1uF
-  ( 1 N-000094 )
+  ( 1 N-000095 )
   ( 2 GND )
  )
  ( /4FE0F72D GSG-0402 C53 4.7pF
-  ( 1 N-000077 )
+  ( 1 N-000080 )
   ( 2 GND )
  )
  ( /4FE0F72C GSG-0402 C54 10nF
-  ( 1 N-000077 )
+  ( 1 N-000080 )
   ( 2 GND )
  )
  ( /4FE0F72B GSG-0402 C55 1uF
-  ( 1 N-000077 )
+  ( 1 N-000080 )
   ( 2 GND )
  )
  ( /4FE0F72A GSG-0402 C56 4.7pF
-  ( 1 N-000090 )
+  ( 1 N-000085 )
   ( 2 GND )
  )
  ( /4FE0F729 GSG-0402 C57 1uF
-  ( 1 N-000090 )
+  ( 1 N-000085 )
   ( 2 GND )
  )
  ( /4FE0F728 GSG-0402 C58 4.7pF
-  ( 1 N-000089 )
+  ( 1 N-000096 )
   ( 2 GND )
  )
  ( /4FE0F727 GSG-0402 C59 1uF
-  ( 1 N-000089 )
+  ( 1 N-000096 )
   ( 2 GND )
  )
  ( /4FE2B83E GSG-0402 C60 10nF
-  ( 1 N-000082 )
-  ( 2 N-000037 )
+  ( 1 N-000005 )
+  ( 2 N-000036 )
  )
  ( /4FF0A494 GSG-0402 C61 100nF
   ( 1 /MIX_BIAS )
   ( 2 GND )
  )
  ( /4FF0A563 GSG-0402 C62 100nF
-  ( 1 N-000038 )
+  ( 1 N-000008 )
   ( 2 GND )
  )
  ( /4FE0E941 GSG-0402 C63 10nF
@@ -254,7 +254,7 @@
  )
  ( /4FE2B807 GSG-0402 C64 10nF
   ( 1 N-000069 )
-  ( 2 N-000006 )
+  ( 2 N-000007 )
  )
  ( /4FE0FF46 GSG-0402 C65 33pF
   ( 1 /TX_LP )
@@ -285,24 +285,24 @@
   ( 2 N-000084 )
  )
  ( /4FF72FE4 GSG-0402 C72 DNP
-  ( 1 N-000086 )
+  ( 1 N-000032 )
   ( 2 N-000031 )
  )
  ( /4FF72FE5 GSG-0402 C73 DNP
-  ( 1 N-000095 )
-  ( 2 N-000088 )
+  ( 1 N-000099 )
+  ( 2 N-000090 )
  )
  ( /4FF72FDF GSG-0402 C74 DNP
-  ( 1 N-000047 )
-  ( 2 N-000085 )
+  ( 1 N-000026 )
+  ( 2 N-000083 )
  )
  ( /4FF72FDE GSG-0402 C75 DNP
   ( 1 N-000029 )
-  ( 2 N-000026 )
+  ( 2 N-000028 )
  )
  ( /4FF72E3F GSG-0402 C76 DNP
-  ( 1 N-000027 )
-  ( 2 N-000087 )
+  ( 1 N-000097 )
+  ( 2 N-000027 )
  )
  ( /4FE0C556 GSG-0402 D1 GSG-DIODE-TVS-BI
   ( 1 GND )
@@ -314,11 +314,11 @@
  )
  ( /4FF7384A GSG-0402 FB1 FILTER
   ( 1 VCC )
-  ( 2 N-000096 )
+  ( 2 N-000102 )
  )
  ( /4FF73848 GSG-0402 FB2 FILTER
   ( 1 VCC )
-  ( 2 N-000078 )
+  ( 2 N-000100 )
  )
  ( /4FF73854 GSG-0402 FB3 FILTER
   ( 1 VCC )
@@ -326,26 +326,26 @@
  )
  ( /4FF73913 GSG-0402 FB4 FILTER
   ( 1 VCC )
-  ( 2 N-000090 )
+  ( 2 N-000085 )
  )
  ( /4FF7340C GSG-0402 FB5 FILTER
   ( 1 VCC )
-  ( 2 N-000080 )
+  ( 2 N-000098 )
  )
  ( /4FF738A0 GSG-0402 FB6 FILTER
   ( 1 VCC )
-  ( 2 N-000094 )
+  ( 2 N-000095 )
  )
  ( /4FF7391A GSG-0402 FB7 FILTER
   ( 1 VCC )
-  ( 2 N-000089 )
+  ( 2 N-000096 )
  )
  ( /4FF738CA GSG-0402 FB8 FILTER
   ( 1 VCC )
-  ( 2 N-000077 )
+  ( 2 N-000080 )
  )
  ( /4FE0EDC7 GSG-0402 L3 4n7
-  ( 1 N-000045 )
+  ( 1 N-000091 )
   ( 2 N-000064 )
  )
  ( /4FE0EDBE GSG-0402 L4 4n7
@@ -353,15 +353,15 @@
   ( 2 N-000092 )
  )
  ( /4FE0EEDD GSG-0402 L5 4n7
-  ( 1 N-000091 )
-  ( 2 N-000032 )
+  ( 1 N-000047 )
+  ( 2 N-000033 )
  )
  ( /4FE0EFB0 GSG-0402 L6 4n7
-  ( 1 N-000038 )
+  ( 1 N-000008 )
   ( 2 N-000048 )
  )
  ( /4FE0DF67 GSG-SMA-EDGE P1 RX_OUT
-  ( 1 N-000044 )
+  ( 1 N-000045 )
   ( 2 GND )
   ( 3 GND )
   ( 4 GND )
@@ -375,16 +375,16 @@
   ( 5 GND )
  )
  ( /4FE0FACB GSG-HEADER-2x5 P3 SERIAL
-  ( 1 N-000098 )
-  ( 2 N-000098 )
-  ( 3 N-000076 )
-  ( 4 N-000076 )
-  ( 5 N-000099 )
-  ( 6 N-000099 )
-  ( 7 N-000020 )
-  ( 8 N-000020 )
-  ( 9 N-000100 )
-  ( 10 N-000100 )
+  ( 1 N-000101 )
+  ( 2 N-000101 )
+  ( 3 N-000077 )
+  ( 4 N-000077 )
+  ( 5 N-000103 )
+  ( 6 N-000103 )
+  ( 7 N-000021 )
+  ( 8 N-000021 )
+  ( 9 N-000104 )
+  ( 10 N-000104 )
  )
  ( /4FE0D214 GSG-SMA-EDGE P4 TX/RX
   ( 1 N-000051 )
@@ -395,10 +395,10 @@
  )
  ( /4FE0FB2E GSG-HEADER-1x2 P5 CLK_IN
   ( 1 GND )
-  ( 2 N-000075 )
+  ( 2 N-000076 )
  )
  ( /4FE0DF72 GSG-SMA-EDGE P6 TX_IN
-  ( 1 N-000039 )
+  ( 1 N-000040 )
   ( 2 GND )
   ( 3 GND )
   ( 4 GND )
@@ -428,105 +428,117 @@
   ( 9 /TX_ANT )
   ( 10 GND )
  )
+ ( /4FFE0EC5 GSG-HOLE-12MIL P9 CONN_1
+  ( 1 ? )
+ )
+ ( /4FFE0ECC GSG-HOLE-12MIL P10 CONN_1
+  ( 1 ? )
+ )
+ ( /4FFE0ED1 GSG-HOLE-12MIL P11 CONN_1
+  ( 1 ? )
+ )
+ ( /4FFE0ED3 GSG-HOLE-12MIL P12 CONN_1
+  ( 1 ? )
+ )
  ( /4FF72E05 GSG-0402 R1 0
-  ( 1 N-000086 )
+  ( 1 N-000032 )
   ( 2 N-000030 )
  )
  ( /4FE0F4EE GSG-0402 R2 100
-  ( 1 N-000096 )
-  ( 2 N-000088 )
+  ( 1 N-000102 )
+  ( 2 N-000090 )
  )
  ( /4FE0F502 GSG-0402 R3 100
-  ( 1 N-000096 )
-  ( 2 N-000095 )
+  ( 1 N-000102 )
+  ( 2 N-000099 )
  )
  ( /4FF72E2A GSG-0402 R4 0
-  ( 1 N-000095 )
-  ( 2 N-000086 )
+  ( 1 N-000099 )
+  ( 2 N-000032 )
  )
  ( /4FF72E0C GSG-0402 R5 0
   ( 1 N-000031 )
   ( 2 N-000084 )
  )
  ( /4FE0F81D GSG-0402 R6 5k
-  ( 1 N-000074 )
-  ( 2 N-000072 )
- )
- ( /4FE0F825 GSG-0402 R7 0
-  ( 1 N-000097 )
+  ( 1 N-000073 )
   ( 2 N-000074 )
  )
+ ( /4FE0F825 GSG-0402 R7 0
+  ( 1 N-000075 )
+  ( 2 N-000073 )
+ )
  ( /4FF72E28 GSG-0402 R8 0
-  ( 1 N-000088 )
+  ( 1 N-000090 )
   ( 2 N-000031 )
  )
  ( /4FE0F5B1 GSG-0402 R9 100
-  ( 1 N-000027 )
-  ( 2 N-000078 )
+  ( 1 N-000097 )
+  ( 2 N-000100 )
  )
  ( /4FE0F5BB GSG-0402 R10 100
-  ( 1 N-000087 )
-  ( 2 N-000078 )
+  ( 1 N-000027 )
+  ( 2 N-000100 )
  )
  ( /4FF72E0E GSG-0402 R11 0
   ( 1 N-000029 )
-  ( 2 N-000047 )
+  ( 2 N-000026 )
  )
  ( /4FF72E2F GSG-0402 R12 0
-  ( 1 N-000027 )
+  ( 1 N-000097 )
   ( 2 N-000029 )
  )
  ( /4FE0F80D GSG-0402 R13 10k
   ( 1 GND )
-  ( 2 N-000073 )
+  ( 2 N-000072 )
  )
  ( /4FF72E10 GSG-0402 R14 0
-  ( 1 N-000026 )
-  ( 2 N-000085 )
+  ( 1 N-000028 )
+  ( 2 N-000083 )
  )
  ( /4FF72E31 GSG-0402 R15 0
-  ( 1 N-000087 )
-  ( 2 N-000026 )
+  ( 1 N-000027 )
+  ( 2 N-000028 )
  )
  ( /4FE0DDD9 GSG-2500BL14M100 T1 RX_IF_BALUN
-  ( 1 N-000044 )
+  ( 1 N-000045 )
   ( 2 GND )
-  ( 3 N-000083 )
-  ( 4 N-000043 )
+  ( 3 N-000082 )
+  ( 4 N-000044 )
   ( 5 /MIX_BIAS )
  )
  ( /4FF61AE0 GSG-B0310J50100AHF T2 RX_BALUN
   ( 1 N-000002 )
   ( 2 /MIX_BIAS )
-  ( 3 N-000034 )
-  ( 4 N-000040 )
+  ( 3 N-000039 )
+  ( 4 N-000041 )
  )
  ( /4FF61AF3 GSG-B0310J50100AHF T4 TX_BALUN
-  ( 1 N-000037 )
+  ( 1 N-000036 )
   ( 2 /MIX_BIAS )
-  ( 3 N-000036 )
-  ( 4 N-000035 )
+  ( 3 N-000094 )
+  ( 4 N-000081 )
  )
  ( /4FE0DF5A GSG-2500BL14M100 T6 TX_IF_BALUN
-  ( 1 N-000039 )
+  ( 1 N-000040 )
   ( 2 GND )
-  ( 3 N-000041 )
-  ( 4 N-000042 )
+  ( 3 N-000042 )
+  ( 4 N-000043 )
   ( 5 /MIX_BIAS )
  )
  ( /4FF07EB1 GSG-SOT563 U1 DMN2400
   ( 1 GND )
   ( 2 /RX_BYPASS )
-  ( 3 N-000045 )
+  ( 3 N-000091 )
   ( 4 /MIX_BIAS )
   ( 5 /!RX_BYPASS )
-  ( 6 N-000045 )
+  ( 6 N-000091 )
  )
  ( /4FE2B4EB GSG-SKY13350-385LF U2 SKY13350
   ( 1 /RX_HP )
-  ( 2 N-000005 )
+  ( 2 N-000004 )
   ( 3 GND )
-  ( 4 N-000004 )
+  ( 4 N-000019 )
   ( 5 /RX_LP )
   ( 6 N-000003 )
  )
@@ -554,12 +566,12 @@
  )
  ( /4FE0D681 GSG-DFN6-3 U6 PE4140
   ( 0 GND )
-  ( 1 N-000083 )
-  ( 2 N-000040 )
-  ( 3 N-000034 )
+  ( 1 N-000082 )
+  ( 2 N-000041 )
+  ( 3 N-000039 )
   ( 4 N-000046 )
   ( 5 N-000064 )
-  ( 6 N-000043 )
+  ( 6 N-000044 )
  )
  ( /4FE0D33B GSG-LP0603 U7 RX_LOWPASS_FILTER
   ( 1 N-000061 )
@@ -579,36 +591,36 @@
   ( 0 GND )
   ( 1 GND )
   ( 2 VCC )
-  ( 3 N-000020 )
-  ( 4 N-000099 )
-  ( 5 N-000076 )
-  ( 6 N-000098 )
+  ( 3 N-000021 )
+  ( 4 N-000103 )
+  ( 5 N-000077 )
+  ( 6 N-000101 )
   ( 7 VCC )
   ( 8 GND )
-  ( 9 N-000095 )
-  ( 10 N-000088 )
+  ( 9 N-000099 )
+  ( 10 N-000090 )
   ( 11 ? )
   ( 12 ? )
   ( 13 ? )
   ( 14 ? )
-  ( 15 N-000027 )
-  ( 16 N-000087 )
+  ( 15 N-000097 )
+  ( 16 N-000027 )
   ( 17 GND )
   ( 18 ? )
   ( 19 ? )
   ( 20 VCC )
   ( 21 VCC )
   ( 22 GND )
-  ( 23 N-000097 )
+  ( 23 N-000075 )
   ( 24 GND )
   ( 25 GND )
-  ( 26 N-000072 )
+  ( 26 N-000074 )
   ( 27 VCC )
   ( 28 VCC )
   ( 29 GND )
-  ( 30 N-000081 )
+  ( 30 N-000078 )
   ( 31 GND )
-  ( 32 N-000100 )
+  ( 32 N-000104 )
  )
  ( /4FE0D2B3 GSG-HP-DEA U10 TX_HIGHPASS_FILTER
   ( 1 N-000068 )
@@ -618,12 +630,12 @@
  )
  ( /4FE0D688 GSG-DFN6-3 U11 PE4140
   ( 0 GND )
-  ( 1 N-000036 )
-  ( 2 N-000042 )
-  ( 3 N-000041 )
+  ( 1 N-000094 )
+  ( 2 N-000043 )
+  ( 3 N-000042 )
   ( 4 N-000048 )
-  ( 5 N-000091 )
-  ( 6 N-000035 )
+  ( 5 N-000047 )
+  ( 6 N-000081 )
  )
  ( /4FE0D25C GSG-SKY13350-385LF U12 SKY13350
   ( 1 /TX_LP )
@@ -650,10 +662,10 @@
  ( /4FF07E88 GSG-SOT563 U15 DMC2400
   ( 1 /MIX_BIAS )
   ( 2 /!TX_BYPASS )
-  ( 3 N-000032 )
+  ( 3 N-000033 )
   ( 4 VCC )
   ( 5 /!TX_BYPASS )
-  ( 6 N-000032 )
+  ( 6 N-000033 )
  )
  ( /4FE103CF GSG-S-PVQFN-14 U16 GSG-74HC04
   ( 0 GND )
@@ -674,19 +686,19 @@
  )
  ( /4FE2B7CC GSG-SKY13350-385LF U17 SKY13350
   ( 1 /TX_HP )
-  ( 2 N-000007 )
+  ( 2 N-000006 )
   ( 3 GND )
-  ( 4 N-000006 )
+  ( 4 N-000007 )
   ( 5 /TX_LP )
-  ( 6 N-000082 )
+  ( 6 N-000005 )
  )
  ( /4FF07A29 GSG-SOT563 U18 DMN2400
   ( 1 GND )
   ( 2 /TX_BYPASS )
-  ( 3 N-000038 )
+  ( 3 N-000008 )
   ( 4 /MIX_BIAS )
   ( 5 /!TX_BYPASS )
-  ( 6 N-000038 )
+  ( 6 N-000008 )
  )
  ( /4FF08E02 SOT23-5 U19 NCP699
   ( 1 VCC )
diff --git a/hardware/bubblegum/bubblegum.sch b/hardware/bubblegum/bubblegum.sch
index 8af13c75..45ccdbeb 100644
--- a/hardware/bubblegum/bubblegum.sch
+++ b/hardware/bubblegum/bubblegum.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sun Jul  8 10:32:41 2012
+EESchema Schematic File Version 2  date Wed Jul 11 17:40:53 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -37,7 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 1 1
 Title ""
-Date "8 jul 2012"
+Date "11 jul 2012"
 Rev ""
 Comp ""
 Comment1 ""
@@ -45,6 +45,48 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+Text Notes 15850 9350 0    40   ~ 0
+mounting holes
+NoConn ~ 16250 9700
+NoConn ~ 16150 9700
+NoConn ~ 16050 9700
+NoConn ~ 15950 9700
+$Comp
+L CONN_1 P12
+U 1 1 4FFE0ED3
+P 16250 9550
+F 0 "P12" H 16330 9550 40  0000 L CNN
+F 1 "CONN_1" H 16250 9605 30  0001 C CNN
+	1    16250 9550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L CONN_1 P11
+U 1 1 4FFE0ED1
+P 16150 9550
+F 0 "P11" H 16230 9550 40  0000 L CNN
+F 1 "CONN_1" H 16150 9605 30  0001 C CNN
+	1    16150 9550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L CONN_1 P10
+U 1 1 4FFE0ECC
+P 16050 9550
+F 0 "P10" H 16130 9550 40  0000 L CNN
+F 1 "CONN_1" H 16050 9605 30  0001 C CNN
+	1    16050 9550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L CONN_1 P9
+U 1 1 4FFE0EC5
+P 15950 9550
+F 0 "P9" H 16030 9550 40  0000 L CNN
+F 1 "CONN_1" H 15950 9605 30  0001 C CNN
+	1    15950 9550
+	0    -1   -1   0   
+$EndComp
 NoConn ~ 12250 4650
 NoConn ~ 12250 4550
 NoConn ~ 12250 4450
@@ -1144,19 +1186,19 @@ Wire Wire Line
 Wire Wire Line
 	15800 6550 15800 6650
 $Comp
-L GND #PWR01
+L GND #PWR63
 U 1 1 4FF73920
 P 15800 7250
-F 0 "#PWR01" H 15800 7250 30  0001 C CNN
+F 0 "#PWR63" H 15800 7250 30  0001 C CNN
 F 1 "GND" H 15800 7180 30  0001 C CNN
 	1    15800 7250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR02
+L GND #PWR73
 U 1 1 4FF7391E
 P 15800 8300
-F 0 "#PWR02" H 15800 8300 30  0001 C CNN
+F 0 "#PWR73" H 15800 8300 30  0001 C CNN
 F 1 "GND" H 15800 8230 30  0001 C CNN
 	1    15800 8300
 	1    0    0    -1  
@@ -1174,19 +1216,19 @@ F 6 "FERRITE BEAD 1000OHM 0402" H 15350 7600 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR03
+L VCC #PWR64
 U 1 1 4FF73919
 P 14900 7500
-F 0 "#PWR03" H 14900 7600 30  0001 C CNN
+F 0 "#PWR64" H 14900 7600 30  0001 C CNN
 F 1 "VCC" H 14900 7600 30  0000 C CNN
 	1    14900 7500
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR04
+L VCC #PWR54
 U 1 1 4FF73914
 P 14900 6450
-F 0 "#PWR04" H 14900 6550 30  0001 C CNN
+F 0 "#PWR54" H 14900 6550 30  0001 C CNN
 F 1 "VCC" H 14900 6550 30  0000 C CNN
 	1    14900 6450
 	1    0    0    -1  
@@ -1213,19 +1255,19 @@ F 1 "4.7pF" H 15850 7800 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR78
 U 1 1 4FF738D6
 P 14250 9000
-F 0 "#PWR05" H 14250 9000 30  0001 C CNN
+F 0 "#PWR78" H 14250 9000 30  0001 C CNN
 F 1 "GND" H 14250 8930 30  0001 C CNN
 	1    14250 9000
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR06
+L VCC #PWR71
 U 1 1 4FF738CB
 P 13350 8200
-F 0 "#PWR06" H 13350 8300 30  0001 C CNN
+F 0 "#PWR71" H 13350 8300 30  0001 C CNN
 F 1 "VCC" H 13350 8300 30  0000 C CNN
 	1    13350 8200
 	1    0    0    -1  
@@ -1243,10 +1285,10 @@ F 6 "FERRITE BEAD 1000OHM 0402" H 13800 8300 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR07
+L GND #PWR66
 U 1 1 4FF738A1
 P 13450 7750
-F 0 "#PWR07" H 13450 7750 30  0001 C CNN
+F 0 "#PWR66" H 13450 7750 30  0001 C CNN
 F 1 "GND" H 13450 7680 30  0001 C CNN
 	1    13450 7750
 	1    0    0    -1  
@@ -1264,28 +1306,28 @@ F 6 "FERRITE BEAD 1000OHM 0402" H 13000 7050 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR08
+L VCC #PWR60
 U 1 1 4FF7389F
 P 12550 6950
-F 0 "#PWR08" H 12550 7050 30  0001 C CNN
+F 0 "#PWR60" H 12550 7050 30  0001 C CNN
 F 1 "VCC" H 12550 7050 30  0000 C CNN
 	1    12550 6950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR57
 U 1 1 4FF7387C
 P 13700 6850
-F 0 "#PWR09" H 13700 6850 30  0001 C CNN
+F 0 "#PWR57" H 13700 6850 30  0001 C CNN
 F 1 "GND" H 13700 6780 30  0001 C CNN
 	1    13700 6850
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR010
+L VCC #PWR49
 U 1 1 4FF73867
 P 12800 6050
-F 0 "#PWR010" H 12800 6150 30  0001 C CNN
+F 0 "#PWR49" H 12800 6150 30  0001 C CNN
 F 1 "VCC" H 12800 6150 30  0000 C CNN
 	1    12800 6050
 	1    0    0    -1  
@@ -1339,10 +1381,10 @@ F 6 "FERRITE BEAD 1000OHM 0402" H 11200 7050 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR011
+L VCC #PWR47
 U 1 1 4FE0F5D9
 P 10800 5800
-F 0 "#PWR011" H 10800 5900 30  0001 C CNN
+F 0 "#PWR47" H 10800 5900 30  0001 C CNN
 F 1 "VCC" H 10800 5900 30  0000 C CNN
 	1    10800 5800
 	1    0    0    -1  
@@ -1501,10 +1543,10 @@ F 1 "100nF" H 7300 2700 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR19
 U 1 1 4FF0A50C
 P 7250 3100
-F 0 "#PWR012" H 7250 3100 30  0001 C CNN
+F 0 "#PWR19" H 7250 3100 30  0001 C CNN
 F 1 "GND" H 7250 3030 30  0001 C CNN
 	1    7250 3100
 	1    0    0    -1  
@@ -1519,10 +1561,10 @@ F 1 "100nF" H 7050 7600 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR68
 U 1 1 4FF0A4AE
 P 7000 8000
-F 0 "#PWR013" H 7000 8000 30  0001 C CNN
+F 0 "#PWR68" H 7000 8000 30  0001 C CNN
 F 1 "GND" H 7000 7930 30  0001 C CNN
 	1    7000 8000
 	1    0    0    -1  
@@ -1552,10 +1594,10 @@ F 6 "XFRMR BALUN RF 300-1000MHZ 0805" H 7750 2400 60  0001 C CNN "Description"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR67
 U 1 1 4FF0A59E
 P 9450 7800
-F 0 "#PWR014" H 9450 7800 30  0001 C CNN
+F 0 "#PWR67" H 9450 7800 30  0001 C CNN
 F 1 "GND" H 9450 7730 30  0001 C CNN
 	1    9450 7800
 	1    0    0    -1  
@@ -1570,10 +1612,10 @@ F 1 "100nF" H 9500 7400 50  0000 L CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR015
+L GND #PWR11
 U 1 1 4FF0A55E
 P 10300 2550
-F 0 "#PWR015" H 10300 2550 30  0001 C CNN
+F 0 "#PWR11" H 10300 2550 30  0001 C CNN
 F 1 "GND" H 10300 2480 30  0001 C CNN
 	1    10300 2550
 	1    0    0    -1  
@@ -1588,10 +1630,10 @@ F 1 "100nF" H 10350 2150 50  0000 L CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR51
 U 1 1 4FF0A549
 P 8050 6150
-F 0 "#PWR016" H 8050 6150 30  0001 C CNN
+F 0 "#PWR51" H 8050 6150 30  0001 C CNN
 F 1 "GND" H 8050 6080 30  0001 C CNN
 	1    8050 6150
 	1    0    0    -1  
@@ -1606,10 +1648,10 @@ F 1 "100nF" H 8100 5750 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR33
 U 1 1 4FF0A53B
 P 8650 4500
-F 0 "#PWR017" H 8650 4500 30  0001 C CNN
+F 0 "#PWR33" H 8650 4500 30  0001 C CNN
 F 1 "GND" H 8650 4430 30  0001 C CNN
 	1    8650 4500
 	1    0    0    -1  
@@ -1624,10 +1666,10 @@ F 1 "100nF" H 8700 4100 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR7
 U 1 1 4FF0A51D
 P 11650 1950
-F 0 "#PWR018" H 11650 1950 30  0001 C CNN
+F 0 "#PWR7" H 11650 1950 30  0001 C CNN
 F 1 "GND" H 11650 1880 30  0001 C CNN
 	1    11650 1950
 	1    0    0    -1  
@@ -1642,10 +1684,10 @@ F 1 "100nF" H 11700 1550 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR019
+L GND #PWR80
 U 1 1 4FF0A4BF
 P 11600 9250
-F 0 "#PWR019" H 11600 9250 30  0001 C CNN
+F 0 "#PWR80" H 11600 9250 30  0001 C CNN
 F 1 "GND" H 11600 9180 30  0001 C CNN
 	1    11600 9250
 	1    0    0    -1  
@@ -1660,10 +1702,10 @@ F 1 "100nF" H 11650 8850 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR90
 U 1 1 4FF08E3E
 P 7850 10250
-F 0 "#PWR020" H 7850 10250 30  0001 C CNN
+F 0 "#PWR90" H 7850 10250 30  0001 C CNN
 F 1 "GND" H 7850 10180 30  0001 C CNN
 	1    7850 10250
 	1    0    0    -1  
@@ -1680,19 +1722,19 @@ F 1 "1uF" H 7900 9850 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR89
 U 1 1 4FF08E28
 P 6400 10250
-F 0 "#PWR021" H 6400 10250 30  0001 C CNN
+F 0 "#PWR89" H 6400 10250 30  0001 C CNN
 F 1 "GND" H 6400 10180 30  0001 C CNN
 	1    6400 10250
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR022
+L VCC #PWR83
 U 1 1 4FF08E20
 P 6400 9550
-F 0 "#PWR022" H 6400 9650 30  0001 C CNN
+F 0 "#PWR83" H 6400 9650 30  0001 C CNN
 F 1 "VCC" H 6400 9650 30  0000 C CNN
 	1    6400 9550
 	1    0    0    -1  
@@ -1707,10 +1749,10 @@ F 1 "1uF" H 6450 9850 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR84
 U 1 1 4FF08E09
 P 6700 9750
-F 0 "#PWR023" H 6700 9750 30  0001 C CNN
+F 0 "#PWR84" H 6700 9750 30  0001 C CNN
 F 1 "GND" H 6700 9680 30  0001 C CNN
 	1    6700 9750
 	0    1    1    0   
@@ -1764,10 +1806,10 @@ MIX_BIAS
 Text Label 11350 1150 0    40   ~ 0
 MIX_BIAS
 $Comp
-L GND #PWR024
+L GND #PWR15
 U 1 1 4FF07B92
 P 10750 2700
-F 0 "#PWR024" H 10750 2700 30  0001 C CNN
+F 0 "#PWR15" H 10750 2700 30  0001 C CNN
 F 1 "GND" H 10750 2630 30  0001 C CNN
 	1    10750 2700
 	1    0    0    -1  
@@ -1785,10 +1827,10 @@ TX_BYPASS
 Text Label 10400 6950 2    40   ~ 0
 MIX_BIAS
 $Comp
-L GND #PWR025
+L GND #PWR69
 U 1 1 4FF07A67
 P 9900 8050
-F 0 "#PWR025" H 9900 8050 30  0001 C CNN
+F 0 "#PWR69" H 9900 8050 30  0001 C CNN
 F 1 "GND" H 9900 7980 30  0001 C CNN
 	1    9900 8050
 	1    0    0    -1  
@@ -1808,10 +1850,10 @@ $EndComp
 Text Label 7650 4750 0    40   ~ 0
 !RX_BYPASS
 $Comp
-L VCC #PWR026
+L VCC #PWR25
 U 1 1 4FF07993
 P 8200 3550
-F 0 "#PWR026" H 8200 3650 30  0001 C CNN
+F 0 "#PWR25" H 8200 3650 30  0001 C CNN
 F 1 "VCC" H 8200 3650 30  0000 C CNN
 	1    8200 3550
 	1    0    0    -1  
@@ -1837,10 +1879,10 @@ Text Label 7050 5450 0    40   ~ 0
 Text Label 7050 6550 0    40   ~ 0
 MIX_BIAS
 $Comp
-L GND #PWR027
+L GND #PWR48
 U 1 1 4FEF438B
 P 15000 5800
-F 0 "#PWR027" H 15000 5800 30  0001 C CNN
+F 0 "#PWR48" H 15000 5800 30  0001 C CNN
 F 1 "GND" H 15000 5730 30  0001 C CNN
 	1    15000 5800
 	1    0    0    -1  
@@ -1848,10 +1890,10 @@ $EndComp
 Text Notes 800  9100 0    40   ~ 0
 switch control logic ensures valid switch configurations
 $Comp
-L GND #PWR028
+L GND #PWR85
 U 1 1 4FEBDCB9
 P 2900 9950
-F 0 "#PWR028" H 2900 9950 30  0001 C CNN
+F 0 "#PWR85" H 2900 9950 30  0001 C CNN
 F 1 "GND" H 2900 9880 30  0001 C CNN
 	1    2900 9950
 	1    0    0    -1  
@@ -1878,10 +1920,10 @@ switchable image reject filters
 Text Label 6400 8300 2    40   ~ 0
 TX_LP
 $Comp
-L GND #PWR029
+L GND #PWR77
 U 1 1 4FE2B9AE
 P 6150 8900
-F 0 "#PWR029" H 6150 8900 30  0001 C CNN
+F 0 "#PWR77" H 6150 8900 30  0001 C CNN
 F 1 "GND" H 6150 8830 30  0001 C CNN
 	1    6150 8900
 	1    0    0    -1  
@@ -1898,10 +1940,10 @@ $EndComp
 Text Label 6500 6750 2    40   ~ 0
 TX_HP
 $Comp
-L GND #PWR030
+L GND #PWR50
 U 1 1 4FE2B99C
 P 6250 6150
-F 0 "#PWR030" H 6250 6150 30  0001 C CNN
+F 0 "#PWR50" H 6250 6150 30  0001 C CNN
 F 1 "GND" H 6250 6080 30  0001 C CNN
 	1    6250 6150
 	-1   0    0    1   
@@ -1918,10 +1960,10 @@ $EndComp
 Text Label 6700 3200 2    40   ~ 0
 RX_LP
 $Comp
-L GND #PWR031
+L GND #PWR29
 U 1 1 4FE2B981
 P 6450 3800
-F 0 "#PWR031" H 6450 3800 30  0001 C CNN
+F 0 "#PWR29" H 6450 3800 30  0001 C CNN
 F 1 "GND" H 6450 3730 30  0001 C CNN
 	1    6450 3800
 	1    0    0    -1  
@@ -1945,19 +1987,19 @@ F 1 "10nF" H 6750 7600 50  0000 L CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR58
 U 1 1 4FE2B829
 P 6050 6900
-F 0 "#PWR032" H 6050 6900 30  0001 C CNN
+F 0 "#PWR58" H 6050 6900 30  0001 C CNN
 F 1 "GND" H 6050 6830 30  0001 C CNN
 	1    6050 6900
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR033
+L GND #PWR6
 U 1 1 4FE2B822
 P 6350 1650
-F 0 "#PWR033" H 6350 1650 30  0001 C CNN
+F 0 "#PWR6" H 6350 1650 30  0001 C CNN
 F 1 "GND" H 6350 1580 30  0001 C CNN
 	1    6350 1650
 	-1   0    0    1   
@@ -1993,10 +2035,10 @@ F 6 "0.01-6.0 GHz GaAs SPDT Switch" H 6150 7450 60  0001 C CNN "Description"
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR034
+L GND #PWR2
 U 1 1 4FE2B69C
 P 6750 950
-F 0 "#PWR034" H 6750 950 30  0001 C CNN
+F 0 "#PWR2" H 6750 950 30  0001 C CNN
 F 1 "GND" H 6750 880 30  0001 C CNN
 	1    6750 950 
 	-1   0    0    1   
@@ -2050,19 +2092,19 @@ F 6 "0.01-6.0 GHz GaAs SPDT Switch" H 6450 2200 60  0001 C CNN "Description"
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR035
+L VCC #PWR82
 U 1 1 4FE104E0
 P 10000 9500
-F 0 "#PWR035" H 10000 9600 30  0001 C CNN
+F 0 "#PWR82" H 10000 9600 30  0001 C CNN
 F 1 "VCC" H 10000 9600 30  0000 C CNN
 	1    10000 9500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR036
+L GND #PWR88
 U 1 1 4FE104D7
 P 9000 10100
-F 0 "#PWR036" H 9000 10100 30  0001 C CNN
+F 0 "#PWR88" H 9000 10100 30  0001 C CNN
 F 1 "GND" H 9000 10030 30  0001 C CNN
 	1    9000 10100
 	1    0    0    -1  
@@ -2077,10 +2119,10 @@ F 1 "VCC" V 9500 9800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR037
+L GND #PWR87
 U 1 1 4FE10495
 P 4750 10050
-F 0 "#PWR037" H 4750 10050 30  0001 C CNN
+F 0 "#PWR87" H 4750 10050 30  0001 C CNN
 F 1 "GND" H 4750 9980 30  0001 C CNN
 	1    4750 10050
 	1    0    0    -1  
@@ -2106,28 +2148,28 @@ F 1 "SWITCH_CTRL" V 4250 9750 50  0000 C CNN
 $EndComp
 NoConn ~ 2300 9550
 $Comp
-L GND #PWR038
+L GND #PWR86
 U 1 1 4FE1041B
 P 1000 10050
-F 0 "#PWR038" H 1000 10050 30  0001 C CNN
+F 0 "#PWR86" H 1000 10050 30  0001 C CNN
 F 1 "GND" H 1000 9980 30  0001 C CNN
 	1    1000 10050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR039
+L GND #PWR91
 U 1 1 4FE10418
 P 1700 10400
-F 0 "#PWR039" H 1700 10400 30  0001 C CNN
+F 0 "#PWR91" H 1700 10400 30  0001 C CNN
 F 1 "GND" H 1700 10330 30  0001 C CNN
 	1    1700 10400
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR040
+L VCC #PWR79
 U 1 1 4FE10413
 P 2900 9250
-F 0 "#PWR040" H 2900 9350 30  0001 C CNN
+F 0 "#PWR79" H 2900 9350 30  0001 C CNN
 F 1 "VCC" H 2900 9350 30  0000 C CNN
 	1    2900 9250
 	1    0    0    -1  
@@ -2167,10 +2209,10 @@ loop filter\n(1.6 MHz)
 Text Label 1550 5750 0    40   ~ 0
 TX_ANT
 $Comp
-L GND #PWR041
+L GND #PWR52
 U 1 1 4FE100EE
 P 1800 6350
-F 0 "#PWR041" H 1800 6350 30  0001 C CNN
+F 0 "#PWR52" H 1800 6350 30  0001 C CNN
 F 1 "GND" H 1800 6280 30  0001 C CNN
 	1    1800 6350
 	1    0    0    -1  
@@ -2185,10 +2227,10 @@ F 1 "33pF" H 1850 5950 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR28
 U 1 1 4FE100E1
 P 1900 3800
-F 0 "#PWR042" H 1900 3800 30  0001 C CNN
+F 0 "#PWR28" H 1900 3800 30  0001 C CNN
 F 1 "GND" H 1900 3730 30  0001 C CNN
 	1    1900 3800
 	-1   0    0    1   
@@ -2207,10 +2249,10 @@ $EndComp
 Text Label 2900 4250 2    40   ~ 0
 !TX_ANT
 $Comp
-L GND #PWR043
+L GND #PWR37
 U 1 1 4FE100B1
 P 2650 4850
-F 0 "#PWR043" H 2650 4850 30  0001 C CNN
+F 0 "#PWR37" H 2650 4850 30  0001 C CNN
 F 1 "GND" H 2650 4780 30  0001 C CNN
 	1    2650 4850
 	1    0    0    -1  
@@ -2225,10 +2267,10 @@ F 1 "33pF" H 2700 4450 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR044
+L GND #PWR10
 U 1 1 4FE100A2
 P 2500 2450
-F 0 "#PWR044" H 2500 2450 30  0001 C CNN
+F 0 "#PWR10" H 2500 2450 30  0001 C CNN
 F 1 "GND" H 2500 2380 30  0001 C CNN
 	1    2500 2450
 	-1   0    0    1   
@@ -2247,10 +2289,10 @@ $EndComp
 Text Label 3750 1550 0    40   ~ 0
 RX_HP
 $Comp
-L GND #PWR045
+L GND #PWR1
 U 1 1 4FE10058
 P 4000 950
-F 0 "#PWR045" H 4000 950 30  0001 C CNN
+F 0 "#PWR1" H 4000 950 30  0001 C CNN
 F 1 "GND" H 4000 880 30  0001 C CNN
 	1    4000 950 
 	-1   0    0    1   
@@ -2267,10 +2309,10 @@ $EndComp
 Text Label 3650 3000 0    40   ~ 0
 RX_LP
 $Comp
-L GND #PWR046
+L GND #PWR26
 U 1 1 4FE10041
 P 3900 3600
-F 0 "#PWR046" H 3900 3600 30  0001 C CNN
+F 0 "#PWR26" H 3900 3600 30  0001 C CNN
 F 1 "GND" H 3900 3530 30  0001 C CNN
 	1    3900 3600
 	1    0    0    -1  
@@ -2287,10 +2329,10 @@ $EndComp
 Text Label 7000 1550 2    40   ~ 0
 RX_HP
 $Comp
-L GND #PWR047
+L GND #PWR53
 U 1 1 4FE0FF86
 P 3200 6350
-F 0 "#PWR047" H 3200 6350 30  0001 C CNN
+F 0 "#PWR53" H 3200 6350 30  0001 C CNN
 F 1 "GND" H 3200 6280 30  0001 C CNN
 	1    3200 6350
 	-1   0    0    1   
@@ -2309,10 +2351,10 @@ $EndComp
 Text Label 2850 8150 0    40   ~ 0
 TX_LP
 $Comp
-L GND #PWR048
+L GND #PWR76
 U 1 1 4FE0FF4C
 P 3100 8900
-F 0 "#PWR048" H 3100 8900 30  0001 C CNN
+F 0 "#PWR76" H 3100 8900 30  0001 C CNN
 F 1 "GND" H 3100 8830 30  0001 C CNN
 	1    3100 8900
 	1    0    0    -1  
@@ -2327,19 +2369,19 @@ F 1 "33pF" H 3150 8500 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR049
+L GND #PWR30
 U 1 1 4FE0FB50
 P 16400 4000
-F 0 "#PWR049" H 16400 4000 30  0001 C CNN
+F 0 "#PWR30" H 16400 4000 30  0001 C CNN
 F 1 "GND" H 16400 3930 30  0001 C CNN
 	1    16400 4000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR050
+L GND #PWR35
 U 1 1 4FE0FB41
 P 15600 4600
-F 0 "#PWR050" H 15600 4600 30  0001 C CNN
+F 0 "#PWR35" H 15600 4600 30  0001 C CNN
 F 1 "GND" H 15600 4530 30  0001 C CNN
 	1    15600 4600
 	1    0    0    -1  
@@ -2446,73 +2488,73 @@ F 1 "22pF" H 15950 3900 50  0000 L CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR20
 U 1 1 4FE0F7A0
 P 12850 3450
-F 0 "#PWR051" H 12850 3450 30  0001 C CNN
+F 0 "#PWR20" H 12850 3450 30  0001 C CNN
 F 1 "GND" H 12850 3380 30  0001 C CNN
 	1    12850 3450
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR052
+L GND #PWR23
 U 1 1 4FE0F79A
 P 13550 3450
-F 0 "#PWR052" H 13550 3450 30  0001 C CNN
+F 0 "#PWR23" H 13550 3450 30  0001 C CNN
 F 1 "GND" H 13550 3380 30  0001 C CNN
 	1    13550 3450
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR053
+L GND #PWR31
 U 1 1 4FE0F793
 P 14250 4250
-F 0 "#PWR053" H 14250 4250 30  0001 C CNN
+F 0 "#PWR31" H 14250 4250 30  0001 C CNN
 F 1 "GND" H 14250 4180 30  0001 C CNN
 	1    14250 4250
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR054
+L GND #PWR32
 U 1 1 4FE0F78C
 P 14250 4450
-F 0 "#PWR054" H 14250 4450 30  0001 C CNN
+F 0 "#PWR32" H 14250 4450 30  0001 C CNN
 F 1 "GND" H 14250 4380 30  0001 C CNN
 	1    14250 4450
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR055
+L GND #PWR45
 U 1 1 4FE0F78A
 P 13350 5550
-F 0 "#PWR055" H 13350 5550 30  0001 C CNN
+F 0 "#PWR45" H 13350 5550 30  0001 C CNN
 F 1 "GND" H 13350 5480 30  0001 C CNN
 	1    13350 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR056
+L GND #PWR42
 U 1 1 4FE0F784
 P 12850 5550
-F 0 "#PWR056" H 12850 5550 30  0001 C CNN
+F 0 "#PWR42" H 12850 5550 30  0001 C CNN
 F 1 "GND" H 12850 5480 30  0001 C CNN
 	1    12850 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR057
+L GND #PWR65
 U 1 1 4FE0F73A
 P 11650 7750
-F 0 "#PWR057" H 11650 7750 30  0001 C CNN
+F 0 "#PWR65" H 11650 7750 30  0001 C CNN
 F 1 "GND" H 11650 7680 30  0001 C CNN
 	1    11650 7750
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR058
+L VCC #PWR59
 U 1 1 4FE0F735
 P 10750 6950
-F 0 "#PWR058" H 10750 7050 30  0001 C CNN
+F 0 "#PWR59" H 10750 7050 30  0001 C CNN
 F 1 "VCC" H 10750 7050 30  0000 C CNN
 	1    10750 6950
 	1    0    0    -1  
@@ -2653,64 +2695,64 @@ F 1 "27pF" H 11700 7250 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR059
+L VCC #PWR36
 U 1 1 4FE0F6CF
 P 14250 4650
-F 0 "#PWR059" H 14250 4750 30  0001 C CNN
+F 0 "#PWR36" H 14250 4750 30  0001 C CNN
 F 1 "VCC" H 14250 4750 30  0000 C CNN
 	1    14250 4650
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR060
+L VCC #PWR34
 U 1 1 4FE0F6CA
 P 14250 4550
-F 0 "#PWR060" H 14250 4650 30  0001 C CNN
+F 0 "#PWR34" H 14250 4650 30  0001 C CNN
 F 1 "VCC" H 14250 4650 30  0000 C CNN
 	1    14250 4550
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR061
+L VCC #PWR43
 U 1 1 4FE0F6B8
 P 13150 5550
-F 0 "#PWR061" H 13150 5650 30  0001 C CNN
+F 0 "#PWR43" H 13150 5650 30  0001 C CNN
 F 1 "VCC" H 13150 5650 30  0000 C CNN
 	1    13150 5550
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR062
+L VCC #PWR44
 U 1 1 4FE0F6B4
 P 13250 5550
-F 0 "#PWR062" H 13250 5650 30  0001 C CNN
+F 0 "#PWR44" H 13250 5650 30  0001 C CNN
 F 1 "VCC" H 13250 5650 30  0000 C CNN
 	1    13250 5550
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR063
+L VCC #PWR22
 U 1 1 4FE0F6A3
 P 13450 3450
-F 0 "#PWR063" H 13450 3550 30  0001 C CNN
+F 0 "#PWR22" H 13450 3550 30  0001 C CNN
 F 1 "VCC" H 13450 3550 30  0000 C CNN
 	1    13450 3450
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR064
+L VCC #PWR21
 U 1 1 4FE0F69E
 P 12950 3450
-F 0 "#PWR064" H 12950 3550 30  0001 C CNN
+F 0 "#PWR21" H 12950 3550 30  0001 C CNN
 F 1 "VCC" H 12950 3550 30  0000 C CNN
 	1    12950 3450
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR065
+L GND #PWR55
 U 1 1 4FE0F604
 P 11850 6600
-F 0 "#PWR065" H 11850 6600 30  0001 C CNN
+F 0 "#PWR55" H 11850 6600 30  0001 C CNN
 F 1 "GND" H 11850 6530 30  0001 C CNN
 	1    11850 6600
 	1    0    0    -1  
@@ -2761,10 +2803,10 @@ F 1 "100" V 11700 5550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR066
+L VCC #PWR9
 U 1 1 4FE0F564
 P 11550 2200
-F 0 "#PWR066" H 11550 2300 30  0001 C CNN
+F 0 "#PWR9" H 11550 2300 30  0001 C CNN
 F 1 "VCC" H 11550 2300 30  0000 C CNN
 	1    11550 2200
 	1    0    0    -1  
@@ -2797,10 +2839,10 @@ F 1 "27pF" H 11900 2700 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR067
+L GND #PWR12
 U 1 1 4FE0F545
 P 12750 2600
-F 0 "#PWR067" H 12750 2600 30  0001 C CNN
+F 0 "#PWR12" H 12750 2600 30  0001 C CNN
 F 1 "GND" H 12750 2530 30  0001 C CNN
 	1    12750 2600
 	1    0    0    -1  
@@ -2824,55 +2866,55 @@ F 1 "100" V 11700 3450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR068
+L GND #PWR38
 U 1 1 4FE0F3FF
 P 12150 5100
-F 0 "#PWR068" H 12150 5100 30  0001 C CNN
+F 0 "#PWR38" H 12150 5100 30  0001 C CNN
 F 1 "GND" H 12150 5030 30  0001 C CNN
 	1    12150 5100
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR069
+L GND #PWR8
 U 1 1 4FE0F3CE
 P 13400 1950
-F 0 "#PWR069" H 13400 1950 30  0001 C CNN
+F 0 "#PWR8" H 13400 1950 30  0001 C CNN
 F 1 "GND" H 13400 1880 30  0001 C CNN
 	1    13400 1950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR070
+L GND #PWR3
 U 1 1 4FE0F3C4
 P 12700 950
-F 0 "#PWR070" H 12700 950 30  0001 C CNN
+F 0 "#PWR3" H 12700 950 30  0001 C CNN
 F 1 "GND" H 12700 880 30  0001 C CNN
 	1    12700 950 
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR071
+L GND #PWR72
 U 1 1 4FE0F366
 P 12700 8250
-F 0 "#PWR071" H 12700 8250 30  0001 C CNN
+F 0 "#PWR72" H 12700 8250 30  0001 C CNN
 F 1 "GND" H 12700 8180 30  0001 C CNN
 	1    12700 8250
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR072
+L GND #PWR81
 U 1 1 4FE0F358
 P 13400 9250
-F 0 "#PWR072" H 13400 9250 30  0001 C CNN
+F 0 "#PWR81" H 13400 9250 30  0001 C CNN
 F 1 "GND" H 13400 9180 30  0001 C CNN
 	1    13400 9250
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR073
+L VCC #PWR41
 U 1 1 4FE0F129
 P 7600 5450
-F 0 "#PWR073" H 7600 5550 30  0001 C CNN
+F 0 "#PWR41" H 7600 5550 30  0001 C CNN
 F 1 "VCC" H 7600 5550 30  0000 C CNN
 	1    7600 5450
 	1    0    0    -1  
@@ -2887,10 +2929,10 @@ F 1 "4n7" V 9300 6700 40  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR074
+L GND #PWR62
 U 1 1 4FE0EF42
 P 9250 7050
-F 0 "#PWR074" H 9250 7050 30  0001 C CNN
+F 0 "#PWR62" H 9250 7050 30  0001 C CNN
 F 1 "GND" H 9250 6980 30  0001 C CNN
 	1    9250 7050
 	0    -1   -1   0   
@@ -2961,37 +3003,37 @@ F 1 "220pF" H 9400 4000 50  0000 L CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR075
+L GND #PWR17
 U 1 1 4FE0EC1B
 P 9050 2900
-F 0 "#PWR075" H 9050 2900 30  0001 C CNN
+F 0 "#PWR17" H 9050 2900 30  0001 C CNN
 F 1 "GND" H 9050 2830 30  0001 C CNN
 	1    9050 2900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR076
+L GND #PWR56
 U 1 1 4FE0EAA8
 P 3800 6750
-F 0 "#PWR076" H 3800 6750 30  0001 C CNN
+F 0 "#PWR56" H 3800 6750 30  0001 C CNN
 F 1 "GND" H 3800 6680 30  0001 C CNN
 	1    3800 6750
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR077
+L GND #PWR75
 U 1 1 4FE0EA9E
 P 5200 8600
-F 0 "#PWR077" H 5200 8600 30  0001 C CNN
+F 0 "#PWR75" H 5200 8600 30  0001 C CNN
 F 1 "GND" H 5200 8530 30  0001 C CNN
 	1    5200 8600
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR078
+L GND #PWR74
 U 1 1 4FE0EA9B
 P 3800 8600
-F 0 "#PWR078" H 3800 8600 30  0001 C CNN
+F 0 "#PWR74" H 3800 8600 30  0001 C CNN
 F 1 "GND" H 3800 8530 30  0001 C CNN
 	1    3800 8600
 	0    1    1    0   
@@ -3033,64 +3075,64 @@ F 1 "100pF" H 3650 6950 50  0000 L CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR079
+L GND #PWR46
 U 1 1 4FE0E8B0
 P 2300 5750
-F 0 "#PWR079" H 2300 5750 30  0001 C CNN
+F 0 "#PWR46" H 2300 5750 30  0001 C CNN
 F 1 "GND" H 2300 5680 30  0001 C CNN
 	1    2300 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR080
+L GND #PWR18
 U 1 1 4FE0E843
 P 2300 3050
-F 0 "#PWR080" H 2300 3050 30  0001 C CNN
+F 0 "#PWR18" H 2300 3050 30  0001 C CNN
 F 1 "GND" H 2300 2980 30  0001 C CNN
 	1    2300 3050
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR081
+L GND #PWR5
 U 1 1 4FE0E7A7
 P 6000 1550
-F 0 "#PWR081" H 6000 1550 30  0001 C CNN
+F 0 "#PWR5" H 6000 1550 30  0001 C CNN
 F 1 "GND" H 6000 1480 30  0001 C CNN
 	1    6000 1550
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR082
+L GND #PWR4
 U 1 1 4FE0E7A5
 P 4600 1250
-F 0 "#PWR082" H 4600 1250 30  0001 C CNN
+F 0 "#PWR4" H 4600 1250 30  0001 C CNN
 F 1 "GND" H 4600 1180 30  0001 C CNN
 	1    4600 1250
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR083
+L GND #PWR13
 U 1 1 4FE0E783
 P 4500 2650
-F 0 "#PWR083" H 4500 2650 30  0001 C CNN
+F 0 "#PWR13" H 4500 2650 30  0001 C CNN
 F 1 "GND" H 4500 2580 30  0001 C CNN
 	1    4500 2650
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR084
+L GND #PWR14
 U 1 1 4FE0E77B
 P 5900 2650
-F 0 "#PWR084" H 5900 2650 30  0001 C CNN
+F 0 "#PWR14" H 5900 2650 30  0001 C CNN
 F 1 "GND" H 5900 2580 30  0001 C CNN
 	1    5900 2650
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR085
+L GND #PWR61
 U 1 1 4FE0E743
 P 5200 7050
-F 0 "#PWR085" H 5200 7050 30  0001 C CNN
+F 0 "#PWR61" H 5200 7050 30  0001 C CNN
 F 1 "GND" H 5200 6980 30  0001 C CNN
 	1    5200 7050
 	0    -1   -1   0   
@@ -3168,55 +3210,55 @@ F 6 "Ultra-High Linearity UltraCMOS Broadband Quad MOSFET Array" H 8800 2350 60
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR086
+L GND #PWR70
 U 1 1 4FE0D546
 P 3300 8150
-F 0 "#PWR086" H 3300 8150 30  0001 C CNN
+F 0 "#PWR70" H 3300 8150 30  0001 C CNN
 F 1 "GND" H 3300 8080 30  0001 C CNN
 	1    3300 8150
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR087
+L GND #PWR24
 U 1 1 4FE0D449
 P 700 3550
-F 0 "#PWR087" H 700 3550 30  0001 C CNN
+F 0 "#PWR24" H 700 3550 30  0001 C CNN
 F 1 "GND" H 700 3480 30  0001 C CNN
 	1    700  3550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR088
+L GND #PWR27
 U 1 1 4FE0D442
 P 1500 3650
-F 0 "#PWR088" H 1500 3650 30  0001 C CNN
+F 0 "#PWR27" H 1500 3650 30  0001 C CNN
 F 1 "GND" H 1500 3580 30  0001 C CNN
 	1    1500 3650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR089
+L GND #PWR39
 U 1 1 4FE0D437
 P 700 5250
-F 0 "#PWR089" H 700 5250 30  0001 C CNN
+F 0 "#PWR39" H 700 5250 30  0001 C CNN
 F 1 "GND" H 700 5180 30  0001 C CNN
 	1    700  5250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR090
+L GND #PWR40
 U 1 1 4FE0D435
 P 1500 5350
-F 0 "#PWR090" H 1500 5350 30  0001 C CNN
+F 0 "#PWR40" H 1500 5350 30  0001 C CNN
 F 1 "GND" H 1500 5280 30  0001 C CNN
 	1    1500 5350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR091
+L GND #PWR16
 U 1 1 4FE0D3F9
 P 4100 2750
-F 0 "#PWR091" H 4100 2750 30  0001 C CNN
+F 0 "#PWR16" H 4100 2750 30  0001 C CNN
 F 1 "GND" H 4100 2680 30  0001 C CNN
 	1    4100 2750
 	1    0    0    -1