diff --git a/hardware/lollipop/lollipop-cache.lib b/hardware/lollipop/lollipop-cache.lib
index ccd465fb..7587a8a0 100644
--- a/hardware/lollipop/lollipop-cache.lib
+++ b/hardware/lollipop/lollipop-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Sun Apr 22 21:56:01 2012
+EESchema-LIBRARY Version 2.3  Date: Sun Apr 22 22:13:19 2012
 #encoding utf-8
 #
 # BALUN
diff --git a/hardware/lollipop/lollipop.sch b/hardware/lollipop/lollipop.sch
index 5902a9c2..c30ce2ef 100644
--- a/hardware/lollipop/lollipop.sch
+++ b/hardware/lollipop/lollipop.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sun Apr 22 21:56:01 2012
+EESchema Schematic File Version 2  date Sun Apr 22 22:13:19 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -44,6 +44,66 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+$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   
+$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   
+$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   
+$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  
+$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  
+$EndComp
 Text Notes 10200 5950 1    400  ~ 0
 mixer
 Wire Bus Line
@@ -239,28 +299,13 @@ F 1 "SKY13317" H 4850 3800 60  0000 C CNN
 $EndComp
 $Comp
 L FIL-LP0603 U?
-U 1 1 4F94CF87
-P 6300 6250
-F 0 "U?" H 6300 6300 60  0000 C CNN
-F 1 "FIL-LP0603" H 6300 6200 60  0000 C CNN
-	1    6300 6250
-	1    0    0    -1  
-$EndComp
-$Comp
-L FIL-DEA U?
-U 1 1 4F94CF80
-P 6300 5450
-F 0 "U?" H 6300 5500 60  0000 C CNN
-F 1 "FIL-DEA" H 6300 5400 60  0000 C CNN
-	1    6300 5450
-	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
@@ -270,6 +315,9 @@ 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
@@ -311,37 +359,13 @@ F 1 "SKY13351" H 8900 4400 60  0000 C CNN
 $EndComp
 $Comp
 L BALUN T?
-U 1 1 4F94CC80
-P 7600 7100
-F 0 "T?" H 7600 7350 70  0000 C CNN
-F 1 "BALUN" H 7600 6800 70  0000 C CNN
-	1    7600 7100
-	-1   0    0    1   
-$EndComp
-$Comp
-L BALUN T?
-U 1 1 4F94CC7C
-P 7600 6300
-F 0 "T?" H 7600 6550 70  0000 C CNN
-F 1 "BALUN" H 7600 6000 70  0000 C CNN
-	1    7600 6300
-	-1   0    0    1   
-$EndComp
-$Comp
-L BALUN T?
-U 1 1 4F94CC75
-P 7600 5500
-F 0 "T?" H 7600 5750 70  0000 C CNN
-F 1 "BALUN" H 7600 5200 70  0000 C CNN
-	1    7600 5500
-	-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
 	-1   0    0    1   
 $EndComp
@@ -351,6 +375,9 @@ 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
 	-1   0    0    1   
 $EndComp
@@ -360,6 +387,9 @@ 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
 	-1   0    0    1   
 $EndComp