diff --git a/hardware/lollipop/lollipop-cache.lib b/hardware/lollipop/lollipop-cache.lib
index ed30d1c6..95187df4 100644
--- a/hardware/lollipop/lollipop-cache.lib
+++ b/hardware/lollipop/lollipop-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Mon Apr 23 09:32:55 2012
+EESchema-LIBRARY Version 2.3  Date: Tue May  8 19:30:48 2012
 #encoding utf-8
 #
 # BALUN
@@ -27,12 +27,30 @@ P 2 0 1 0  -25 200  -25 -200 N
 P 2 0 1 0  25 -200  25 200 N
 X S1 1 400 -200 300 L 60 60 1 1 P
 X S2 2 400 200 300 L 60 60 1 1 P
-X PR2 3 -400 -200 300 R 60 60 1 1 P
-X PR1 4 -400 200 300 R 60 60 1 1 P
+X PR1 3 -400 200 300 R 60 60 1 1 P
+X PR2 4 -400 -200 300 R 60 60 1 1 P
 X PM 5 -400 0 300 R 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 50 100 50 H V L CNN
+F1 "C" 50 -100 50 H V L CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$ENDFPLIST
+DRAW
+P 2 0 1 10  -100 -30  100 -30 N
+P 2 0 1 10  -100 30  100 30 N
+X ~ 1 0 200 170 D 40 40 1 1 P
+X ~ 2 0 -200 170 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
 # FIL-DEA
 #
 DEF FIL-DEA U 0 40 Y Y 1 F N
@@ -61,6 +79,17 @@ X GND 4 600 -150 300 L 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# GND
+#
+DEF ~GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 30 H I C CNN
+F1 "GND" 0 -70 30 H I C CNN
+DRAW
+P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+X GND 1 0 0 0 U 30 30 1 1 W N
+ENDDRAW
+ENDDEF
+#
 # GSG-SMA-CONN
 #
 DEF GSG-SMA-CONN P 0 0 Y N 1 F N
diff --git a/hardware/lollipop/lollipop.sch b/hardware/lollipop/lollipop.sch
index 81280b39..e45d5fea 100644
--- a/hardware/lollipop/lollipop.sch
+++ b/hardware/lollipop/lollipop.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mon Apr 23 09:32:55 2012
+EESchema Schematic File Version 2  date Tue May  8 19:30:48 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -37,7 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 1 1
 Title ""
-Date "23 apr 2012"
+Date "9 may 2012"
 Rev ""
 Comp ""
 Comment1 ""
@@ -45,461 +45,644 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 1200 5500 0    60   ~ 0
-RX only
-Text Notes 1200 4200 0    60   ~ 0
-TX/RX
 Wire Wire Line
-	3900 4250 4000 4250
+	14100 2000 14000 2000
 Wire Wire Line
-	4000 4250 4000 4750
+	14000 2000 14000 2400
 Wire Wire Line
-	4000 4750 2600 4750
+	14300 2400 14000 2400
 Wire Wire Line
-	2600 4750 2600 5250
+	14300 2400 14300 3950
 Wire Wire Line
-	2600 5250 2700 5250
+	11450 1000 7500 1000
 Wire Wire Line
-	4300 3400 4000 3400
+	7500 1000 7500 2950
 Wire Wire Line
-	4000 3400 4000 4050
+	7500 2950 7400 2950
 Wire Wire Line
-	4000 4050 3900 4050
+	15000 1600 14900 1600
 Wire Wire Line
-	2300 5450 2700 5450
+	13850 800  13750 800 
 Wire Wire Line
-	13500 6200 13200 6200
+	13350 1600 13250 1600
 Wire Wire Line
-	13200 6200 13200 6700
+	11850 1300 11950 1300
 Wire Wire Line
-	13200 6700 11100 6700
+	11850 1200 11950 1200
+Connection ~ 13250 1400
 Wire Wire Line
-	11100 6700 11100 6250
+	13500 1400 13250 1400
 Wire Wire Line
-	13500 4000 13200 4000
+	13250 1600 13250 1300
 Wire Wire Line
-	13200 4000 13200 3500
+	13250 1300 13150 1300
 Wire Wire Line
-	13200 3500 11100 3500
+	15200 6450 15300 6450
 Wire Wire Line
-	11100 3500 11100 3950
+	14400 6850 14300 6850
 Wire Wire Line
-	9500 5600 9700 5600
+	14300 6850 14300 6950
 Wire Wire Line
-	9700 5600 9700 5350
+	3300 4300 3400 4300
 Wire Wire Line
-	9700 5350 10000 5350
+	3400 4300 3400 4800
 Wire Wire Line
-	10000 4850 9700 4850
+	3400 4800 2000 4800
 Wire Wire Line
-	9700 4850 9700 4600
+	2000 4800 2000 5300
 Wire Wire Line
-	9700 4600 9500 4600
+	2000 5300 2100 5300
 Wire Wire Line
-	8000 5700 8200 5700
+	3700 3450 3400 3450
 Wire Wire Line
-	8200 5700 8200 6100
+	3400 3450 3400 4100
 Wire Wire Line
-	8200 6100 8300 6100
+	3400 4100 3300 4100
 Wire Wire Line
-	8000 4100 8200 4100
+	1700 5500 2100 5500
 Wire Wire Line
-	8200 4100 8200 4500
+	12900 6250 12600 6250
 Wire Wire Line
-	8200 4500 8300 4500
+	12600 6250 12600 6750
 Wire Wire Line
-	5700 6100 5400 6100
+	12600 6750 10500 6750
 Wire Wire Line
-	4300 3700 4200 3700
+	10500 6750 10500 6300
 Wire Wire Line
-	4200 3700 4200 4800
+	12900 4050 12600 4050
 Wire Wire Line
-	4200 4800 5700 4800
+	12600 4050 12600 3550
 Wire Wire Line
-	5700 3700 5400 3700
+	12600 3550 10500 3550
 Wire Wire Line
-	6900 5300 7200 5300
+	10500 3550 10500 4000
 Wire Wire Line
-	6900 3700 7200 3700
+	8900 5650 9100 5650
 Wire Wire Line
-	8000 4900 8200 4900
+	9100 5650 9100 5400
 Wire Wire Line
-	8200 4900 8200 4700
+	9100 5400 9400 5400
 Wire Wire Line
-	8200 4700 8300 4700
+	9400 4900 9100 4900
 Wire Wire Line
-	8000 2900 8100 2900
+	9100 4900 9100 4650
 Wire Wire Line
-	8100 2900 8100 3200
+	9100 4650 8900 4650
 Wire Wire Line
-	8000 3300 13300 3300
+	7400 5750 7600 5750
 Wire Wire Line
-	13300 3300 13300 3800
+	7600 5750 7600 6150
 Wire Wire Line
-	13300 3800 13500 3800
+	7600 6150 7700 6150
 Wire Wire Line
-	13500 3400 11000 3400
+	7400 4150 7600 4150
 Wire Wire Line
-	14900 3900 14700 3900
+	7600 4150 7600 4550
 Wire Wire Line
-	14700 3300 14900 3300
+	7600 4550 7700 4550
 Wire Wire Line
-	8100 3200 13500 3200
+	5100 6150 4800 6150
 Wire Wire Line
-	13500 7000 8100 7000
+	3700 3750 3600 3750
 Wire Wire Line
-	14700 6300 14900 6300
+	3600 3750 3600 4850
 Wire Wire Line
-	14900 6900 14700 6900
+	3600 4850 5100 4850
 Wire Wire Line
-	13500 6400 13300 6400
+	5100 3750 4800 3750
 Wire Wire Line
-	13300 6400 13300 6900
+	6300 5350 6600 5350
 Wire Wire Line
-	13300 6900 8000 6900
+	6300 3750 6600 3750
 Wire Wire Line
-	13500 6800 11000 6800
+	7400 4950 7600 4950
 Wire Wire Line
-	8100 7000 8100 7300
+	7600 4950 7600 4750
 Wire Wire Line
-	8100 7300 8000 7300
+	7600 4750 7700 4750
 Wire Wire Line
-	8300 6300 8200 6300
+	7400 3350 12700 3350
 Wire Wire Line
-	8200 6300 8200 6500
+	12700 3350 12700 3850
 Wire Wire Line
-	8200 6500 8000 6500
+	12700 3850 12900 3850
 Wire Wire Line
-	8300 5500 8200 5500
+	14300 3950 14100 3950
 Wire Wire Line
-	8200 5500 8200 5300
+	12900 7050 7500 7050
 Wire Wire Line
-	8200 5300 8000 5300
+	14100 6350 14300 6350
 Wire Wire Line
-	8300 3900 8200 3900
+	14300 6950 14100 6950
 Wire Wire Line
-	8200 3900 8200 3700
+	12900 6450 12700 6450
 Wire Wire Line
-	8200 3700 8000 3700
+	12700 6450 12700 6950
 Wire Wire Line
-	6900 4500 7200 4500
+	12700 6950 7400 6950
 Wire Wire Line
-	6900 6100 7200 6100
+	12900 6850 10400 6850
 Wire Wire Line
-	7200 2900 5500 2900
+	7500 7050 7500 7350
 Wire Wire Line
-	5500 2900 5500 3400
+	7500 7350 7400 7350
 Wire Wire Line
-	5500 3400 5400 3400
+	7700 6350 7600 6350
 Wire Wire Line
-	5700 5600 5500 5600
+	7600 6350 7600 6550
 Wire Wire Line
-	5500 5600 5500 5800
+	7600 6550 7400 6550
 Wire Wire Line
-	5500 5800 5400 5800
+	7700 5550 7600 5550
 Wire Wire Line
-	7200 6900 4200 6900
+	7600 5550 7600 5350
 Wire Wire Line
-	4200 6900 4200 6100
+	7600 5350 7400 5350
 Wire Wire Line
-	4200 6100 4300 6100
+	7700 3950 7600 3950
 Wire Wire Line
-	4300 5800 4000 5800
+	7600 3950 7600 3750
 Wire Wire Line
-	8300 4100 8300 4400
+	7600 3750 7400 3750
 Wire Wire Line
-	8300 4400 8000 4400
+	6300 4550 6600 4550
 Wire Wire Line
-	8000 4400 8000 4500
+	6300 6150 6600 6150
 Wire Wire Line
-	8300 5700 8300 6000
+	6600 2950 4900 2950
 Wire Wire Line
-	8300 6000 8000 6000
+	4900 2950 4900 3450
 Wire Wire Line
-	8000 6000 8000 6100
+	4900 3450 4800 3450
 Wire Wire Line
-	9500 4000 9900 4000
+	5100 5650 4900 5650
 Wire Wire Line
-	9900 4000 9900 4750
+	4900 5650 4900 5850
 Wire Wire Line
-	9900 4750 10000 4750
+	4900 5850 4800 5850
 Wire Wire Line
-	9500 6200 9900 6200
+	6600 6950 3600 6950
 Wire Wire Line
-	9900 6200 9900 5450
+	3600 6950 3600 6150
 Wire Wire Line
-	9900 5450 10000 5450
+	3600 6150 3700 6150
 Wire Wire Line
-	11000 3400 11000 3950
+	3700 5850 3400 5850
 Wire Wire Line
-	11000 6800 11000 6250
+	7700 4150 7700 4450
 Wire Wire Line
-	2300 4150 2700 4150
+	7700 4450 7400 4450
 Wire Wire Line
-	3900 5350 4000 5350
+	7400 4450 7400 4550
 Wire Wire Line
-	4000 5350 4000 5800
+	7700 5750 7700 6050
+Wire Wire Line
+	7700 6050 7400 6050
+Wire Wire Line
+	7400 6050 7400 6150
+Wire Wire Line
+	8900 4050 9300 4050
+Wire Wire Line
+	9300 4050 9300 4800
+Wire Wire Line
+	9300 4800 9400 4800
+Wire Wire Line
+	8900 6250 9300 6250
+Wire Wire Line
+	9300 6250 9300 5500
+Wire Wire Line
+	9300 5500 9400 5500
+Wire Wire Line
+	10400 4000 10400 1300
+Wire Wire Line
+	10400 6850 10400 6300
+Wire Wire Line
+	1700 4200 2100 4200
+Wire Wire Line
+	3300 5400 3400 5400
+Wire Wire Line
+	3400 5400 3400 5850
+Wire Wire Line
+	14300 6350 14300 6450
+Wire Wire Line
+	14300 6450 14400 6450
+Wire Wire Line
+	13150 1200 13350 1200
+Wire Wire Line
+	13150 1100 13250 1100
+Wire Wire Line
+	13250 1100 13250 800 
+Wire Wire Line
+	13500 1000 13250 1000
+Connection ~ 13250 1000
+Wire Wire Line
+	11850 1000 11850 1100
+Wire Wire Line
+	11850 1100 11950 1100
+Wire Wire Line
+	13850 1600 13750 1600
+Wire Wire Line
+	13250 800  13350 800 
+Wire Wire Line
+	13750 1200 14000 1200
+Wire Wire Line
+	14000 1200 14000 1600
+Wire Wire Line
+	14000 1600 14100 1600
+Wire Wire Line
+	15000 2000 14900 2000
+Wire Wire Line
+	10400 1300 11450 1300
 $Comp
-L RFFC5071 U?
-U 1 1 4F957166
-P 11150 5100
-F 0 "U?" H 11150 5200 60  0000 C CNN
-F 1 "RFFC5071" H 11150 5000 60  0000 C CNN
-	1    11150 5100
-	-1   0    0    1   
+L GND #PWR?
+U 1 1 4FA9C887
+P 15000 2000
+F 0 "#PWR?" H 15000 2000 30  0001 C CNN
+F 1 "GND" H 15000 1930 30  0001 C CNN
+	1    15000 2000
+	0    -1   -1   0   
 $EndComp
 $Comp
-L BALUN T?
-U 1 1 4F94D6C4
-P 7600 6300
-F 0 "T?" H 7600 6550 70  0000 C CNN
-F 1 "BALUN" H 7600 6000 70  0000 C CNN
-F 4 "Pulse Electronics" H 7600 6300 60  0001 C CNN "Manufacturer"
-F 5 "CX2156NL" H 7600 6300 60  0001 C CNN "Part Number"
-F 6 "TRANSFORMR BALUN 2.3-2700MHZ SMD" H 7600 6300 60  0001 C CNN "Description"
-	1    7600 6300
-	-1   0    0    1   
+L C C?
+U 1 1 4FA9C7B1
+P 11650 1300
+F 0 "C?" H 11700 1400 50  0000 L CNN
+F 1 "100pF" H 11700 1200 50  0000 L CNN
+	1    11650 1300
+	0    1    1    0   
 $EndComp
 $Comp
-L BALUN T?
-U 1 1 4F94D601
-P 7600 5500
-F 0 "T?" H 7600 5750 70  0000 C CNN
-F 1 "BALUN" H 7600 5200 70  0000 C CNN
-F 4 "TDK" H 7600 5500 60  0001 C CNN "Manufacturer"
-F 5 "HHM1595A1" H 7600 5500 60  0001 C CNN "Part Number"
-F 6 "XFMR BALUN RF 3.0-8.0GHZ UWB SMD" H 7600 5500 60  0001 C CNN "Description"
-	1    7600 5500
-	-1   0    0    1   
+L C C?
+U 1 1 4FA9C7AF
+P 11650 1000
+F 0 "C?" H 11700 1100 50  0000 L CNN
+F 1 "100pF" H 11700 900 50  0000 L CNN
+	1    11650 1000
+	0    -1   -1   0   
 $EndComp
 $Comp
-L BALUN T?
-U 1 1 4F94D59C
-P 7600 7100
-F 0 "T?" H 7600 7350 70  0000 C CNN
-F 1 "BALUN" H 7600 6800 70  0000 C CNN
-F 4 "Johanson Technology" H 7600 7100 60  0001 C CNN "Manufacturer"
-F 5 "2500BL14M100T" H 7600 7100 60  0001 C CNN "Part Number"
-F 6 "BALUN CERAMIC CHIP WIMAX 2.5GHZ" H 7600 7100 60  0001 C CNN "Description"
-	1    7600 7100
-	-1   0    0    1   
+L GND #PWR?
+U 1 1 4FA9C79F
+P 11850 1200
+F 0 "#PWR?" H 11850 1200 30  0001 C CNN
+F 1 "GND" H 11850 1130 30  0001 C CNN
+	1    11850 1200
+	0    1    1    0   
 $EndComp
 $Comp
-L FIL-LP0603 U?
-U 1 1 4F94D561
-P 6300 6250
-F 0 "U?" H 6300 6300 60  0000 C CNN
-F 1 "FIL-LP0603" H 6300 6200 60  0000 C CNN
-F 4 "AVX" H 6300 6250 60  0001 C CNN "Manufacturer"
-F 5 "LP0603A1880ANTR" H 6300 6250 60  0001 C CNN "Part Number"
-F 6 "FILTER LOW PASS 1880MHZ 0603 SMD" H 6300 6250 60  0001 C CNN "Description"
-	1    6300 6250
-	1    0    0    -1  
+L GND #PWR?
+U 1 1 4FA9C78C
+P 13850 800
+F 0 "#PWR?" H 13850 800 30  0001 C CNN
+F 1 "GND" H 13850 730 30  0001 C CNN
+	1    13850 800 
+	0    -1   -1   0   
 $EndComp
 $Comp
-L FIL-DEA U?
-U 1 1 4F94D4F4
-P 6300 5450
-F 0 "U?" H 6300 5500 60  0000 C CNN
-F 1 "FIL-DEA" H 6300 5400 60  0000 C CNN
-F 4 "TDK" H 6300 5450 60  0001 C CNN "Manufacturer"
-F 5 "DEA162400HT-8004B1" H 6300 5450 60  0001 C CNN "Part Number"
-F 6 "FILTER HIGHPASS WLAN&BLUETOOTH" H 6300 5450 60  0001 C CNN "Description"
-	1    6300 5450
-	1    0    0    -1  
+L GND #PWR?
+U 1 1 4FA9C788
+P 13850 1600
+F 0 "#PWR?" H 13850 1600 30  0001 C CNN
+F 1 "GND" H 13850 1530 30  0001 C CNN
+	1    13850 1600
+	0    -1   -1   0   
+$EndComp
+Text Label 13500 1000 2    40   ~ 0
+SWTXB1
+Text Label 13500 1400 2    40   ~ 0
+SWTXB2
+$Comp
+L C C?
+U 1 1 4FA9C6EF
+P 13550 1200
+F 0 "C?" H 13600 1300 50  0000 L CNN
+F 1 "100pF" H 13600 1100 50  0000 L CNN
+	1    13550 1200
+	0    -1   -1   0   
+$EndComp
+$Comp
+L C C?
+U 1 1 4FA9C6ED
+P 13550 1600
+F 0 "C?" H 13600 1700 50  0000 L CNN
+F 1 "33pF" H 13600 1500 50  0000 L CNN
+	1    13550 1600
+	0    1    1    0   
+$EndComp
+$Comp
+L C C?
+U 1 1 4FA9C67C
+P 13550 800
+F 0 "C?" H 13600 900 50  0000 L CNN
+F 1 "33pF" H 13600 700 50  0000 L CNN
+	1    13550 800 
+	0    -1   -1   0   
 $EndComp
 $Comp
 L GSG-SMA-CONN P?
-U 1 1 4F94D0F2
-P 2000 4150
-F 0 "P?" H 2000 4300 60  0000 C CNN
-F 1 "GSG-SMA-CONN" H 2000 4000 60  0000 C CNN
-	1    2000 4150
-	1    0    0    -1  
+U 1 1 4FA9C5BB
+P 15600 6450
+F 0 "P?" H 15600 6600 60  0000 C CNN
+F 1 "RX-OUT" H 15600 6300 60  0000 C CNN
+	1    15600 6450
+	-1   0    0    -1  
 $EndComp
 $Comp
 L GSG-SMA-CONN P?
-U 1 1 4F94D0E4
-P 2000 5450
-F 0 "P?" H 2000 5600 60  0000 C CNN
-F 1 "GSG-SMA-CONN" H 2000 5300 60  0000 C CNN
-	1    2000 5450
-	1    0    0    -1  
+U 1 1 4FA9C5A4
+P 15300 1600
+F 0 "P?" H 15300 1750 60  0000 C CNN
+F 1 "TX-IN" H 15300 1450 60  0000 C CNN
+	1    15300 1600
+	-1   0    0    -1  
 $EndComp
 $Comp
-L SKY13351 U?
-U 1 1 4F94D08D
-P 3300 4150
-F 0 "U?" H 3300 4350 60  0000 C CNN
-F 1 "SKY13351" H 3300 3950 60  0000 C CNN
-	1    3300 4150
-	-1   0    0    1   
-$EndComp
-$Comp
-L SKY13351 U?
-U 1 1 4F94D06D
-P 3300 5350
-F 0 "U?" H 3300 5550 60  0000 C CNN
-F 1 "SKY13351" H 3300 5150 60  0000 C CNN
-	1    3300 5350
-	1    0    0    -1  
-$EndComp
-$Comp
-L SKY13317 U?
-U 1 1 4F94CFA9
-P 4850 3550
-F 0 "U?" H 4850 3550 60  0000 C CNN
-F 1 "SKY13317" H 4850 3800 60  0000 C CNN
-	1    4850 3550
-	1    0    0    -1  
-$EndComp
-$Comp
-L FIL-LP0603 U?
-U 1 1 4F94CF46
-P 6300 3850
-F 0 "U?" H 6300 3900 60  0000 C CNN
-F 1 "FIL-LP0603" H 6300 3800 60  0000 C CNN
-F 4 "AVX" H 6300 3850 60  0001 C CNN "Manufacturer"
-F 5 "LP0603A1880ANTR" H 6300 3850 60  0001 C CNN "Part Number"
-F 6 "FILTER LOW PASS 1880MHZ 0603 SMD" H 6300 3850 60  0001 C CNN "Description"
-	1    6300 3850
-	1    0    0    -1  
-$EndComp
-$Comp
-L FIL-DEA U?
-U 1 1 4F94CF02
-P 6300 4650
-F 0 "U?" H 6300 4700 60  0000 C CNN
-F 1 "FIL-DEA" H 6300 4600 60  0000 C CNN
-F 4 "TDK" H 6300 4650 60  0001 C CNN "Manufacturer"
-F 5 "DEA162400HT-8004B1" H 6300 4650 60  0001 C CNN "Part Number"
-F 6 "FILTER HIGHPASS WLAN&BLUETOOTH" H 6300 4650 60  0001 C CNN "Description"
-	1    6300 4650
-	1    0    0    -1  
-$EndComp
-$Comp
-L SKY13351 U?
-U 1 1 4F94CD1A
-P 8900 6200
-F 0 "U?" H 8900 6400 60  0000 C CNN
-F 1 "SKY13351" H 8900 6000 60  0000 C CNN
-	1    8900 6200
-	1    0    0    -1  
-$EndComp
-$Comp
-L SKY13351 U?
-U 1 1 4F94CD19
-P 8900 5600
-F 0 "U?" H 8900 5800 60  0000 C CNN
-F 1 "SKY13351" H 8900 5400 60  0000 C CNN
-	1    8900 5600
-	1    0    0    -1  
-$EndComp
-$Comp
-L SKY13351 U?
-U 1 1 4F94CCC3
-P 8900 4000
-F 0 "U?" H 8900 4200 60  0000 C CNN
-F 1 "SKY13351" H 8900 3800 60  0000 C CNN
-	1    8900 4000
-	1    0    0    -1  
-$EndComp
-$Comp
-L SKY13351 U?
-U 1 1 4F94CCC2
-P 8900 4600
-F 0 "U?" H 8900 4800 60  0000 C CNN
-F 1 "SKY13351" H 8900 4400 60  0000 C CNN
-	1    8900 4600
+L BALUN T?
+U 1 1 4FA9C4FC
+P 14800 6650
+F 0 "T?" H 14800 6900 70  0000 C CNN
+F 1 "BALUN" H 14800 6350 70  0000 C CNN
+F 4 "Johanson Technology" H 14800 6650 60  0001 C CNN "Manufacturer"
+F 5 "2500BL14M100T" H 14800 6650 60  0001 C CNN "Part Number"
+F 6 "BALUN CERAMIC CHIP WIMAX 2.5GHZ" H 14800 6650 60  0001 C CNN "Description"
+	1    14800 6650
 	1    0    0    -1  
 $EndComp
 $Comp
 L BALUN T?
-U 1 1 4F94CC6F
-P 7600 4700
-F 0 "T?" H 7600 4950 70  0000 C CNN
-F 1 "BALUN" H 7600 4400 70  0000 C CNN
-F 4 "TDK" H 7600 4700 60  0001 C CNN "Manufacturer"
-F 5 "HHM1595A1" H 7600 4700 60  0001 C CNN "Part Number"
-F 6 "XFMR BALUN RF 3.0-8.0GHZ UWB SMD" H 7600 4700 60  0001 C CNN "Description"
-	1    7600 4700
+U 1 1 4FA9C4DF
+P 14500 1800
+F 0 "T?" H 14500 2050 70  0000 C CNN
+F 1 "BALUN" H 14500 1500 70  0000 C CNN
+F 4 "Johanson Technology" H 14500 1800 60  0001 C CNN "Manufacturer"
+F 5 "2500BL14M100T" H 14500 1800 60  0001 C CNN "Part Number"
+F 6 "BALUN CERAMIC CHIP WIMAX 2.5GHZ" H 14500 1800 60  0001 C CNN "Description"
+	1    14500 1800
+	1    0    0    -1  
+$EndComp
+$Comp
+L BALUN T?
+U 1 1 4F94CC10
+P 7000 3150
+F 0 "T?" H 7000 3400 70  0000 C CNN
+F 1 "BALUN" H 7000 2850 70  0000 C CNN
+F 4 "Johanson Technology" H 7000 3150 60  0001 C CNN "Manufacturer"
+F 5 "2500BL14M100T" H 7000 3150 60  0001 C CNN "Part Number"
+F 6 "BALUN CERAMIC CHIP WIMAX 2.5GHZ" H 7000 3150 60  0001 C CNN "Description"
+	1    7000 3150
 	-1   0    0    1   
 $EndComp
 $Comp
 L BALUN T?
 U 1 1 4F94CC5E
-P 7600 3900
-F 0 "T?" H 7600 4150 70  0000 C CNN
-F 1 "BALUN" H 7600 3600 70  0000 C CNN
-F 4 "Pulse Electronics" H 7600 3900 60  0001 C CNN "Manufacturer"
-F 5 "CX2156NL" H 7600 3900 60  0001 C CNN "Part Number"
-F 6 "TRANSFORMR BALUN 2.3-2700MHZ SMD" H 7600 3900 60  0001 C CNN "Description"
-	1    7600 3900
+P 7000 3950
+F 0 "T?" H 7000 4200 70  0000 C CNN
+F 1 "BALUN" H 7000 3650 70  0000 C CNN
+F 4 "Pulse Electronics" H 7000 3950 60  0001 C CNN "Manufacturer"
+F 5 "CX2156NL" H 7000 3950 60  0001 C CNN "Part Number"
+F 6 "TRANSFORMR BALUN 2.3-2700MHZ SMD" H 7000 3950 60  0001 C CNN "Description"
+	1    7000 3950
 	-1   0    0    1   
 $EndComp
 $Comp
 L BALUN T?
-U 1 1 4F94CC10
-P 7600 3100
-F 0 "T?" H 7600 3350 70  0000 C CNN
-F 1 "BALUN" H 7600 2800 70  0000 C CNN
-F 4 "Johanson Technology" H 7600 3100 60  0001 C CNN "Manufacturer"
-F 5 "2500BL14M100T" H 7600 3100 60  0001 C CNN "Part Number"
-F 6 "BALUN CERAMIC CHIP WIMAX 2.5GHZ" H 7600 3100 60  0001 C CNN "Description"
-	1    7600 3100
+U 1 1 4F94CC6F
+P 7000 4750
+F 0 "T?" H 7000 5000 70  0000 C CNN
+F 1 "BALUN" H 7000 4450 70  0000 C CNN
+F 4 "TDK" H 7000 4750 60  0001 C CNN "Manufacturer"
+F 5 "HHM1595A1" H 7000 4750 60  0001 C CNN "Part Number"
+F 6 "XFMR BALUN RF 3.0-8.0GHZ UWB SMD" H 7000 4750 60  0001 C CNN "Description"
+	1    7000 4750
 	-1   0    0    1   
 $EndComp
-Text Label 14900 3300 2    40   ~ 0
-TXRF+
+$Comp
+L BALUN T?
+U 1 1 4F94D601
+P 7000 5550
+F 0 "T?" H 7000 5800 70  0000 C CNN
+F 1 "BALUN" H 7000 5250 70  0000 C CNN
+F 4 "TDK" H 7000 5550 60  0001 C CNN "Manufacturer"
+F 5 "HHM1595A1" H 7000 5550 60  0001 C CNN "Part Number"
+F 6 "XFMR BALUN RF 3.0-8.0GHZ UWB SMD" H 7000 5550 60  0001 C CNN "Description"
+	1    7000 5550
+	-1   0    0    1   
+$EndComp
+$Comp
+L BALUN T?
+U 1 1 4F94D6C4
+P 7000 6350
+F 0 "T?" H 7000 6600 70  0000 C CNN
+F 1 "BALUN" H 7000 6050 70  0000 C CNN
+F 4 "Pulse Electronics" H 7000 6350 60  0001 C CNN "Manufacturer"
+F 5 "CX2156NL" H 7000 6350 60  0001 C CNN "Part Number"
+F 6 "TRANSFORMR BALUN 2.3-2700MHZ SMD" H 7000 6350 60  0001 C CNN "Description"
+	1    7000 6350
+	-1   0    0    1   
+$EndComp
+$Comp
+L BALUN T?
+U 1 1 4F94D59C
+P 7000 7150
+F 0 "T?" H 7000 7400 70  0000 C CNN
+F 1 "BALUN" H 7000 6850 70  0000 C CNN
+F 4 "Johanson Technology" H 7000 7150 60  0001 C CNN "Manufacturer"
+F 5 "2500BL14M100T" H 7000 7150 60  0001 C CNN "Part Number"
+F 6 "BALUN CERAMIC CHIP WIMAX 2.5GHZ" H 7000 7150 60  0001 C CNN "Description"
+	1    7000 7150
+	-1   0    0    1   
+$EndComp
+Text Notes 600  5550 0    60   ~ 0
+RX only
+Text Notes 600  4250 0    60   ~ 0
+TX/RX
+$Comp
+L RFFC5071 U?
+U 1 1 4F957166
+P 10550 5150
+F 0 "U?" H 10550 5250 60  0000 C CNN
+F 1 "RFFC5071" H 10550 5050 60  0000 C CNN
+	1    10550 5150
+	-1   0    0    1   
+$EndComp
+$Comp
+L FIL-LP0603 U?
+U 1 1 4F94D561
+P 5700 6300
+F 0 "U?" H 5700 6350 60  0000 C CNN
+F 1 "FIL-LP0603" H 5700 6250 60  0000 C CNN
+F 4 "AVX" H 5700 6300 60  0001 C CNN "Manufacturer"
+F 5 "LP0603A1880ANTR" H 5700 6300 60  0001 C CNN "Part Number"
+F 6 "FILTER LOW PASS 1880MHZ 0603 SMD" H 5700 6300 60  0001 C CNN "Description"
+	1    5700 6300
+	1    0    0    -1  
+$EndComp
+$Comp
+L FIL-DEA U?
+U 1 1 4F94D4F4
+P 5700 5500
+F 0 "U?" H 5700 5550 60  0000 C CNN
+F 1 "FIL-DEA" H 5700 5450 60  0000 C CNN
+F 4 "TDK" H 5700 5500 60  0001 C CNN "Manufacturer"
+F 5 "DEA162400HT-8004B1" H 5700 5500 60  0001 C CNN "Part Number"
+F 6 "FILTER HIGHPASS WLAN&BLUETOOTH" H 5700 5500 60  0001 C CNN "Description"
+	1    5700 5500
+	1    0    0    -1  
+$EndComp
+$Comp
+L GSG-SMA-CONN P?
+U 1 1 4F94D0F2
+P 1400 4200
+F 0 "P?" H 1400 4350 60  0000 C CNN
+F 1 "GSG-SMA-CONN" H 1400 4050 60  0000 C CNN
+	1    1400 4200
+	1    0    0    -1  
+$EndComp
+$Comp
+L GSG-SMA-CONN P?
+U 1 1 4F94D0E4
+P 1400 5500
+F 0 "P?" H 1400 5650 60  0000 C CNN
+F 1 "GSG-SMA-CONN" H 1400 5350 60  0000 C CNN
+	1    1400 5500
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4F94D08D
+P 2700 4200
+F 0 "U?" H 2700 4400 60  0000 C CNN
+F 1 "SKY13351" H 2700 4000 60  0000 C CNN
+	1    2700 4200
+	-1   0    0    1   
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4F94D06D
+P 2700 5400
+F 0 "U?" H 2700 5600 60  0000 C CNN
+F 1 "SKY13351" H 2700 5200 60  0000 C CNN
+	1    2700 5400
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13317 U?
+U 1 1 4F94CFA9
+P 4250 3600
+F 0 "U?" H 4250 3600 60  0000 C CNN
+F 1 "SKY13317" H 4250 3850 60  0000 C CNN
+	1    4250 3600
+	1    0    0    -1  
+$EndComp
+$Comp
+L FIL-LP0603 U?
+U 1 1 4F94CF46
+P 5700 3900
+F 0 "U?" H 5700 3950 60  0000 C CNN
+F 1 "FIL-LP0603" H 5700 3850 60  0000 C CNN
+F 4 "AVX" H 5700 3900 60  0001 C CNN "Manufacturer"
+F 5 "LP0603A1880ANTR" H 5700 3900 60  0001 C CNN "Part Number"
+F 6 "FILTER LOW PASS 1880MHZ 0603 SMD" H 5700 3900 60  0001 C CNN "Description"
+	1    5700 3900
+	1    0    0    -1  
+$EndComp
+$Comp
+L FIL-DEA U?
+U 1 1 4F94CF02
+P 5700 4700
+F 0 "U?" H 5700 4750 60  0000 C CNN
+F 1 "FIL-DEA" H 5700 4650 60  0000 C CNN
+F 4 "TDK" H 5700 4700 60  0001 C CNN "Manufacturer"
+F 5 "DEA162400HT-8004B1" H 5700 4700 60  0001 C CNN "Part Number"
+F 6 "FILTER HIGHPASS WLAN&BLUETOOTH" H 5700 4700 60  0001 C CNN "Description"
+	1    5700 4700
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4F94CD1A
+P 8300 6250
+F 0 "U?" H 8300 6450 60  0000 C CNN
+F 1 "SKY13351" H 8300 6050 60  0000 C CNN
+	1    8300 6250
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4F94CD19
+P 8300 5650
+F 0 "U?" H 8300 5850 60  0000 C CNN
+F 1 "SKY13351" H 8300 5450 60  0000 C CNN
+	1    8300 5650
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4F94CCC3
+P 8300 4050
+F 0 "U?" H 8300 4250 60  0000 C CNN
+F 1 "SKY13351" H 8300 3850 60  0000 C CNN
+	1    8300 4050
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4F94CCC2
+P 8300 4650
+F 0 "U?" H 8300 4850 60  0000 C CNN
+F 1 "SKY13351" H 8300 4450 60  0000 C CNN
+	1    8300 4650
+	1    0    0    -1  
+$EndComp
 $Comp
 L SKY13351 U?
 U 1 1 4F94CBE3
-P 14100 6300
-F 0 "U?" H 14100 6500 60  0000 C CNN
-F 1 "SKY13351" H 14100 6100 60  0000 C CNN
-	1    14100 6300
+P 13500 6350
+F 0 "U?" H 13500 6550 60  0000 C CNN
+F 1 "SKY13351" H 13500 6150 60  0000 C CNN
+	1    13500 6350
 	1    0    0    -1  
 $EndComp
 $Comp
 L SKY13351 U?
 U 1 1 4F94CBE2
-P 14100 6900
-F 0 "U?" H 14100 7100 60  0000 C CNN
-F 1 "SKY13351" H 14100 6700 60  0000 C CNN
-	1    14100 6900
+P 13500 6950
+F 0 "U?" H 13500 7150 60  0000 C CNN
+F 1 "SKY13351" H 13500 6750 60  0000 C CNN
+	1    13500 6950
 	1    0    0    -1  
 $EndComp
-Text Label 14900 3900 2    40   ~ 0
+Text Label 14300 3950 2    40   ~ 0
 TXRF-
-Text Label 14900 6900 2    40   ~ 0
+Text Label 14300 6950 2    40   ~ 0
 RXRF-
 $Comp
 L SKY13351 U?
 U 1 1 4F94CBAF
-P 14100 3900
-F 0 "U?" H 14100 4100 60  0000 C CNN
-F 1 "SKY13351" H 14100 3700 60  0000 C CNN
-	1    14100 3900
+P 13500 3950
+F 0 "U?" H 13500 4150 60  0000 C CNN
+F 1 "SKY13351" H 13500 3750 60  0000 C CNN
+	1    13500 3950
 	1    0    0    -1  
 $EndComp
 $Comp
 L SKY13351 U?
 U 1 1 4F94CB86
-P 14100 3300
-F 0 "U?" H 14100 3500 60  0000 C CNN
-F 1 "SKY13351" H 14100 3100 60  0000 C CNN
-	1    14100 3300
+P 12550 1200
+F 0 "U?" H 12550 1400 60  0000 C CNN
+F 1 "SKY13351" H 12550 1000 60  0000 C CNN
+	1    12550 1200
 	1    0    0    -1  
 $EndComp
 $Comp
 L SKY13317 U?
 U 1 1 4F94CB80
-P 4850 5950
-F 0 "U?" H 4850 5950 60  0000 C CNN
-F 1 "SKY13317" H 4850 6200 60  0000 C CNN
-	1    4850 5950
+P 4250 6000
+F 0 "U?" H 4250 6000 60  0000 C CNN
+F 1 "SKY13317" H 4250 6250 60  0000 C CNN
+	1    4250 6000
 	1    0    0    -1  
 $EndComp
-Text Label 14900 6300 2    40   ~ 0
+Text Label 14300 6350 2    40   ~ 0
 RXRF+
 $EndSCHEMATC