diff --git a/atrf.sch b/atrf.sch
index f922ed3..613592d 100644
--- a/atrf.sch
+++ b/atrf.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Wed Aug 18 16:13:59 2010
+EESchema Schematic File Version 2  date Fri Aug 20 17:20:36 2010
 LIBS:power
 LIBS:device
 LIBS:conn
@@ -13,7 +13,7 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 3 3
 Title ""
-Date "18 aug 2010"
+Date "20 aug 2010"
 Rev ""
 Comp ""
 Comment1 ""
@@ -41,18 +41,14 @@ Wire Notes Line
 Wire Wire Line
 	4550 4200 3950 4200
 Wire Wire Line
-	3950 2600 3950 2400
-Wire Wire Line
-	3950 2400 3950 2200
+	3950 2600 3950 2200
 Wire Wire Line
 	3300 4000 3300 3800
 Wire Wire Line
 	1550 4000 1550 3300
 Connection ~ 2300 3200
 Wire Wire Line
-	2500 3200 2300 3200
-Wire Wire Line
-	2300 3200 1950 3200
+	2500 3200 1950 3200
 Wire Wire Line
 	2300 3400 2300 3200
 Wire Wire Line
@@ -78,22 +74,14 @@ Wire Wire Line
 	7950 2650 7950 2450
 Connection ~ 9700 2450
 Wire Wire Line
-	9900 2450 9700 2450
-Wire Wire Line
-	9700 2450 8550 2450
+	9900 2450 8550 2450
 Wire Wire Line
 	8550 2450 8550 2650
 Connection ~ 10500 1950
 Wire Wire Line
 	10500 1950 10100 1950
 Wire Wire Line
-	10500 2650 10500 2450
-Wire Wire Line
-	10500 2450 10500 1950
-Wire Wire Line
-	10500 1950 10500 1650
-Wire Wire Line
-	10500 1650 10500 1150
+	10500 2650 10500 1150
 Wire Wire Line
 	10500 1150 10300 1150
 Wire Wire Line
@@ -101,21 +89,9 @@ Wire Wire Line
 Connection ~ 6500 3600
 Connection ~ 7500 2450
 Wire Wire Line
-	6500 2450 7500 2450
+	6500 2450 7800 2450
 Wire Wire Line
-	7500 2450 7650 2450
-Wire Wire Line
-	7650 2450 7800 2450
-Wire Wire Line
-	6500 2450 6500 3600
-Wire Wire Line
-	6500 3600 6500 3750
-Wire Wire Line
-	6500 3750 6500 3900
-Wire Wire Line
-	6500 3900 6500 4350
-Wire Wire Line
-	6500 4350 6500 4850
+	6500 2450 6500 4850
 Connection ~ 6500 4350
 Wire Wire Line
 	6700 4350 6500 4350
@@ -129,14 +105,10 @@ Wire Wire Line
 Wire Wire Line
 	8100 6950 8100 6750
 Wire Wire Line
-	7500 5450 7500 5650
-Wire Wire Line
-	7500 5650 7500 5850
+	7500 5450 7500 5850
 Connection ~ 9700 4500
 Wire Wire Line
-	9700 4850 9700 4500
-Wire Wire Line
-	9700 4500 9700 4050
+	9700 4850 9700 4050
 Wire Wire Line
 	9500 4500 9700 4500
 Wire Wire Line
@@ -148,13 +120,9 @@ Wire Wire Line
 Wire Wire Line
 	8550 5850 8550 5450
 Wire Wire Line
-	8400 6350 8400 6150
+	8400 6350 8400 5450
 Wire Wire Line
-	8400 6150 8400 5450
-Wire Wire Line
-	8100 6350 8100 5650
-Wire Wire Line
-	8100 5650 8100 5450
+	8100 6350 8100 5450
 Wire Wire Line
 	8250 5450 8250 5650
 Wire Wire Line
@@ -182,9 +150,7 @@ Wire Wire Line
 Wire Wire Line
 	9000 5850 9000 5450
 Wire Wire Line
-	6700 4500 5350 4500
-Wire Wire Line
-	5350 4500 5100 4500
+	6700 4500 5100 4500
 Connection ~ 5350 4500
 Wire Wire Line
 	6500 3600 6700 3600
@@ -209,9 +175,7 @@ Connection ~ 10500 1650
 Wire Wire Line
 	8400 2650 8400 1150
 Wire Wire Line
-	8400 1150 9700 1150
-Wire Wire Line
-	9700 1150 9900 1150
+	8400 1150 9900 1150
 Connection ~ 9700 1150
 Wire Wire Line
 	7950 2050 7950 1850
@@ -220,25 +184,19 @@ Wire Wire Line
 Wire Wire Line
 	7600 1450 7600 1250
 Wire Wire Line
-	7600 1250 7850 1250
-Wire Wire Line
-	7850 1250 8100 1250
+	7600 1250 8100 1250
 Wire Wire Line
 	7850 1050 7850 1250
 Connection ~ 7850 1250
 Wire Wire Line
-	3950 3000 3950 3200
-Wire Wire Line
-	3950 3200 3950 3400
+	3950 3000 3950 3400
 Connection ~ 3950 3200
 Connection ~ 3300 3200
 Connection ~ 3950 2400
 Wire Wire Line
 	6700 4200 4950 4200
 Wire Wire Line
-	3950 4400 3950 4200
-Wire Wire Line
-	3950 4200 3950 4000
+	3950 4400 3950 4000
 Connection ~ 3950 4200
 Wire Wire Line
 	3950 1400 3950 1600
@@ -249,9 +207,7 @@ Wire Wire Line
 Wire Wire Line
 	1550 3300 1350 3300
 Wire Wire Line
-	3100 3200 3300 3200
-Wire Wire Line
-	3300 3200 3950 3200
+	3100 3200 3950 3200
 Wire Wire Line
 	4550 2400 3950 2400
 Wire Notes Line
@@ -263,9 +219,7 @@ Wire Notes Line
 Wire Wire Line
 	3150 6350 3150 6150
 Wire Wire Line
-	3150 6150 3400 6150
-Wire Wire Line
-	3400 6150 3650 6150
+	3150 6150 3650 6150
 Wire Wire Line
 	3650 6150 3650 6350
 $Comp
diff --git a/usb.sch b/usb.sch
index 6c8680d..cad2948 100644
--- a/usb.sch
+++ b/usb.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Wed Aug 18 15:44:36 2010
+EESchema Schematic File Version 2  date Fri Aug 20 17:20:36 2010
 LIBS:power
 LIBS:device
 LIBS:conn
@@ -13,7 +13,7 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 2 3
 Title ""
-Date "18 aug 2010"
+Date "20 aug 2010"
 Rev ""
 Comp ""
 Comment1 ""
@@ -21,19 +21,24 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+Connection ~ 5600 1200
+Wire Wire Line
+	5600 1000 5600 2750
+Wire Wire Line
+	8250 1700 8250 1500
+Wire Wire Line
+	8250 1500 8050 1500
+Wire Wire Line
+	6950 1500 6750 1500
 Wire Wire Line
 	3700 4050 3700 2900
 Connection ~ 5150 3350
 Wire Wire Line
-	5150 2700 5150 4500
+	5150 4500 5150 2700
 Wire Wire Line
 	4750 4500 4750 3650
 Wire Wire Line
-	5800 2750 5600 2750
-Wire Wire Line
-	5600 2750 5600 2550
-Wire Wire Line
-	6050 1600 5750 1600
+	5600 2750 5800 2750
 Wire Wire Line
 	9800 5200 7200 5200
 Wire Wire Line
@@ -42,10 +47,6 @@ Wire Wire Line
 	8600 3500 9800 3500
 Wire Wire Line
 	8600 3200 9800 3200
-Wire Wire Line
-	9800 1600 6900 1600
-Wire Wire Line
-	6900 1600 6900 1800
 Wire Wire Line
 	5800 3050 4150 3050
 Wire Wire Line
@@ -62,11 +63,11 @@ Wire Wire Line
 	7050 4600 7050 6150
 Connection ~ 6750 4800
 Wire Wire Line
-	6750 6150 6750 4600
+	6750 4600 6750 6150
 Connection ~ 4750 3650
 Connection ~ 3700 3650
 Wire Wire Line
-	3700 3650 5800 3650
+	5800 3650 3700 3650
 Wire Wire Line
 	3400 4550 3400 4750
 Wire Wire Line
@@ -135,13 +136,12 @@ Wire Wire Line
 Wire Wire Line
 	7350 5100 9800 5100
 Wire Wire Line
-	6750 1800 6750 1600
+	6750 1500 6750 1800
 Wire Wire Line
-	6750 1600 6550 1600
+	7450 1500 7650 1500
 Wire Wire Line
-	5350 1600 5050 1600
-Wire Wire Line
-	5050 1600 5050 1800
+	5600 1200 9800 1200
+NoConn ~ 6900 1800
 Text Label 2550 3200 0    60   ~ 0
 D+
 Text Label 2550 3050 0    60   ~ 0
@@ -160,11 +160,11 @@ $EndComp
 $Comp
 L TST P10
 U 1 1 4C6409BB
-P 5600 2550
-F 0 "P10" H 5600 2850 40  0000 C CNN
-F 1 "TST" H 5600 2800 30  0000 C CNN
-F 2 "PAD_60x60" H 5600 2550 60  0001 C CNN
-	1    5600 2550
+P 5600 1000
+F 0 "P10" H 5600 1300 40  0000 C CNN
+F 1 "TST" H 5600 1250 30  0000 C CNN
+F 2 "PAD_60x60" H 5600 1000 60  0001 C CNN
+	1    5600 1000
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -197,10 +197,10 @@ $EndComp
 $Comp
 L GND #PWR09
 U 1 1 4C6408AD
-P 5050 1800
-F 0 "#PWR09" H 5050 1800 30  0001 C CNN
-F 1 "GND" H 5050 1730 30  0001 C CNN
-	1    5050 1800
+P 8250 1700
+F 0 "#PWR09" H 8250 1700 30  0001 C CNN
+F 1 "GND" H 8250 1630 30  0001 C CNN
+	1    8250 1700
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -313,27 +313,27 @@ $EndComp
 $Comp
 L R R1
 U 1 1 4C6402F2
-P 6300 1600
-F 0 "R1" V 6380 1600 50  0000 C CNN
-F 1 "68" V 6300 1600 50  0000 C CNN
-F 2 "0603" H 6300 1600 60  0001 C CNN
-	1    6300 1600
+P 7200 1500
+F 0 "R1" V 7280 1500 50  0000 C CNN
+F 1 "68" V 7200 1500 50  0000 C CNN
+F 2 "0603" H 7200 1500 60  0001 C CNN
+	1    7200 1500
 	0    1    -1   0   
 $EndComp
 $Comp
 L LED D1
 U 1 1 4C6402EE
-P 5550 1600
-F 0 "D1" H 5550 1700 50  0000 C CNN
-F 1 "LTST-C190KTKR" H 5550 1500 50  0000 C CNN
-F 2 "0603" H 5550 1600 60  0001 C CNN
-	1    5550 1600
-	-1   0    0    -1  
+P 7850 1500
+F 0 "D1" H 7850 1600 50  0000 C CNN
+F 1 "LTST-C190KTKR" H 7850 1400 50  0000 C CNN
+F 2 "0603" H 7850 1500 60  0001 C CNN
+	1    7850 1500
+	1    0    0    -1  
 $EndComp
 NoConn ~ 7350 1800
 NoConn ~ 7200 1800
 NoConn ~ 7050 1800
-Text HLabel 9800 1600 2    60   Input ~ 0
+Text HLabel 9800 1200 2    60   Input ~ 0
 IRQ_RF
 Text HLabel 9800 5200 2    60   Output ~ 0
 nSS
diff --git a/wpan-atrf.brd b/wpan-atrf.brd
index 3fb0ec8..a405282 100644
--- a/wpan-atrf.brd
+++ b/wpan-atrf.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Wed Aug 18 18:09:13 2010
+PCBNEW-BOARD Version 1 date Fri Aug 20 17:27:55 2010
 
 # Created by Pcbnew(2010-08-11 BZR 2448)-unstable
 
@@ -10,17 +10,17 @@ Links 100
 NoConn 0
 Di 40281 33556 62755 41276
 Ndraw 34
-Ntrack 369
+Ntrack 366
 Nzone 0
 BoardThickness 630
 Nmodule 45
-Nnets 31
+Nnets 30
 $EndGENERAL
 
 $SHEETDESCR
 Sheet A4 11700 8267
 Title ""
-Date "18 aug 2010"
+Date "20 aug 2010"
 Rev ""
 Comp ""
 Comment1 ""
@@ -70,51 +70,51 @@ Na 1 "/RF/CLKM"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 2 "/RF/MOSI"
+Na 2 "/RF/IRQ_RF"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 3 "/RF/RFN"
+Na 3 "/RF/MOSI"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 4 "/RF/RPF"
+Na 4 "/RF/RFN"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 5 "/RF/SCLK"
+Na 5 "/RF/RPF"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 6 "/RF/SLP_TR"
+Na 6 "/RF/SCLK"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 7 "/RF/TST"
+Na 7 "/RF/SLP_TR"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 8 "/RF/nSS"
+Na 8 "/RF/TST"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 9 "/USB/C2CK"
+Na 9 "/RF/nSS"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 10 "/USB/C2D"
+Na 10 "/USB/C2CK"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 11 "/USB/D+"
+Na 11 "/USB/C2D"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 12 "/USB/D-"
+Na 12 "/USB/D+"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 13 "/USB/IRQ_RF"
+Na 13 "/USB/D-"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -138,51 +138,47 @@ Na 18 "N-000009"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 19 "N-000017"
+Na 19 "N-000010"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 20 "N-000020"
+Na 20 "N-000023"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 21 "N-000023"
+Na 21 "N-000024"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 22 "N-000024"
+Na 22 "N-000025"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 23 "N-000025"
+Na 23 "N-000027"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 24 "N-000027"
+Na 24 "N-000029"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 25 "N-000029"
+Na 25 "N-000030"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 26 "N-000030"
+Na 26 "N-000034"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 27 "N-000034"
+Na 27 "N-000035"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 28 "N-000035"
+Na 28 "N-000036"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 29 "N-000036"
-St ~
-$EndEQUIPOT
-$EQUIPOT
-Na 30 "VDD"
+Na 29 "VDD"
 St ~
 $EndEQUIPOT
 $NCLASS
@@ -196,6 +192,7 @@ uViaDia 200
 uViaDrill 50
 AddNet ""
 AddNet "/RF/CLKM"
+AddNet "/RF/IRQ_RF"
 AddNet "/RF/MOSI"
 AddNet "/RF/RFN"
 AddNet "/RF/RPF"
@@ -207,14 +204,12 @@ AddNet "/USB/C2CK"
 AddNet "/USB/C2D"
 AddNet "/USB/D+"
 AddNet "/USB/D-"
-AddNet "/USB/IRQ_RF"
 AddNet "/USB/MISO"
 AddNet "/USB/VBUS"
 AddNet "/USB/nRST_RF"
 AddNet "AGND"
 AddNet "N-000009"
-AddNet "N-000017"
-AddNet "N-000020"
+AddNet "N-000010"
 AddNet "N-000023"
 AddNet "N-000024"
 AddNet "N-000025"
@@ -243,7 +238,7 @@ $PAD
 Sh "1" R 157 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 7 "/RF/TST"
+Ne 8 "/RF/TST"
 Po -176 0
 $EndPAD
 $PAD
@@ -271,14 +266,14 @@ $PAD
 Sh "1" R 157 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "N-000024"
+Ne 21 "N-000024"
 Po -176 0
 $EndPAD
 $PAD
 Sh "2" R 157 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "N-000023"
+Ne 20 "N-000023"
 Po 176 0
 $EndPAD
 $EndMODULE  0402
@@ -306,7 +301,7 @@ $PAD
 Sh "2" R 157 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "N-000036"
+Ne 28 "N-000036"
 Po 176 0
 $EndPAD
 $EndMODULE  0402
@@ -327,14 +322,14 @@ $PAD
 Sh "1" R 157 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "N-000024"
+Ne 21 "N-000024"
 Po -176 0
 $EndPAD
 $PAD
 Sh "2" R 157 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 27 "N-000034"
+Ne 26 "N-000034"
 Po 176 0
 $EndPAD
 $EndMODULE  0402
@@ -355,7 +350,7 @@ $PAD
 Sh "1" R 157 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 28 "N-000035"
+Ne 27 "N-000035"
 Po -176 0
 $EndPAD
 $PAD
@@ -383,7 +378,7 @@ $PAD
 Sh "1" R 157 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 26 "N-000030"
+Ne 25 "N-000030"
 Po -176 0
 $EndPAD
 $PAD
@@ -411,7 +406,7 @@ $PAD
 Sh "1" R 157 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "VDD"
+Ne 29 "VDD"
 Po -176 0
 $EndPAD
 $PAD
@@ -439,7 +434,7 @@ $PAD
 Sh "1" R 157 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 23 "N-000025"
+Ne 22 "N-000025"
 Po -176 0
 $EndPAD
 $PAD
@@ -474,7 +469,7 @@ $PAD
 Sh "2" R 157 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 24 "N-000027"
+Ne 23 "N-000027"
 Po 176 0
 $EndPAD
 $EndMODULE  0402
@@ -495,7 +490,7 @@ $PAD
 Sh "1" R 157 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "VDD"
+Ne 29 "VDD"
 Po -176 0
 $EndPAD
 $PAD
@@ -523,14 +518,14 @@ $PAD
 Sh "1" R 157 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "N-000023"
+Ne 20 "N-000023"
 Po -176 0
 $EndPAD
 $PAD
 Sh "2" R 157 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 3 "/RF/RFN"
+Ne 4 "/RF/RFN"
 Po 176 0
 $EndPAD
 $EndMODULE  0402
@@ -551,14 +546,14 @@ $PAD
 Sh "1" R 157 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "N-000036"
+Ne 28 "N-000036"
 Po -176 0
 $EndPAD
 $PAD
 Sh "2" R 157 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 4 "/RF/RPF"
+Ne 5 "/RF/RPF"
 Po 176 0
 $EndPAD
 $EndMODULE  0402
@@ -579,7 +574,7 @@ $PAD
 Sh "1" R 157 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "N-000023"
+Ne 20 "N-000023"
 Po -176 0
 $EndPAD
 $PAD
@@ -607,7 +602,7 @@ $PAD
 Sh "1" R 157 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "N-000024"
+Ne 21 "N-000024"
 Po -176 0
 $EndPAD
 $PAD
@@ -635,7 +630,7 @@ $PAD
 Sh "1" R 157 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 27 "N-000034"
+Ne 26 "N-000034"
 Po -176 0
 $EndPAD
 $PAD
@@ -663,14 +658,14 @@ $PAD
 Sh "1" R 157 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000029"
+Ne 24 "N-000029"
 Po -176 0
 $EndPAD
 $PAD
 Sh "2" R 157 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 27 "N-000034"
+Ne 26 "N-000034"
 Po 176 0
 $EndPAD
 $EndMODULE  0402
@@ -719,7 +714,7 @@ $PAD
 Sh "1" R 197 354 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 12 "/USB/D-"
+Ne 13 "/USB/D-"
 Po -294 0
 $EndPAD
 $PAD
@@ -747,7 +742,7 @@ $PAD
 Sh "1" R 197 354 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 11 "/USB/D+"
+Ne 12 "/USB/D+"
 Po -294 0
 $EndPAD
 $PAD
@@ -759,27 +754,27 @@ Po 294 0
 $EndPAD
 $EndMODULE  0603
 $MODULE 0603
-Po 46900 35200 1800 15 4C63FA2D 4C643919 ~~
+Po 46700 35400 2700 15 4C63FA2D 4C643919 ~~
 Li 0603
 Sc 4C643919
 AR /4C609BEF/4C6402F2
 Op 0 0 0
 At SMD 
-T0 0 -150 200 200 1800 40 N V 25 N"R1"
-T1 0 150 200 200 1800 40 N I 25 N"68"
+T0 0 -150 200 200 2700 40 N V 25 N"R1"
+T1 0 150 200 200 2700 40 N I 25 N"68"
 DS -443 227 -443 -227 50 21
 DS -443 -227 443 -227 50 21
 DS 443 -227 443 227 50 21
 DS 443 227 -443 227 50 21
 $PAD
-Sh "1" R 197 354 0 0 1800
+Sh "1" R 197 354 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 19 "N-000017"
+Ne 19 "N-000010"
 Po -294 0
 $EndPAD
 $PAD
-Sh "2" R 197 354 0 0 1800
+Sh "2" R 197 354 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 18 "N-000009"
@@ -803,7 +798,7 @@ $PAD
 Sh "1" R 197 354 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 18 "N-000009"
+Ne 19 "N-000010"
 Po -294 0
 $EndPAD
 $PAD
@@ -831,7 +826,7 @@ $PAD
 Sh "1" R 197 354 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "VDD"
+Ne 29 "VDD"
 Po -294 0
 $EndPAD
 $PAD
@@ -908,7 +903,7 @@ $PAD
 Sh "2" R 197 196 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 25 "N-000029"
+Ne 24 "N-000029"
 Po 826 -39
 $EndPAD
 $PAD
@@ -1012,14 +1007,14 @@ $PAD
 Sh "2" R 905 197 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 12 "/USB/D-"
+Ne 13 "/USB/D-"
 Po -452 -314
 $EndPAD
 $PAD
 Sh "3" R 905 196 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 11 "/USB/D+"
+Ne 12 "/USB/D+"
 Po -452 0
 $EndPAD
 $PAD
@@ -1095,7 +1090,7 @@ $PAD
 Sh "1" O 1200 600 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 10 "/USB/C2D"
+Ne 11 "/USB/C2D"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_120x60
@@ -1112,7 +1107,7 @@ $PAD
 Sh "1" O 1200 600 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 9 "/USB/C2CK"
+Ne 10 "/USB/C2CK"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_120x60
@@ -1163,7 +1158,7 @@ $PAD
 Sh "1" O 786 196 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 6 "/RF/SLP_TR"
+Ne 7 "/RF/SLP_TR"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_2mm
@@ -1197,7 +1192,7 @@ $PAD
 Sh "1" O 786 196 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 13 "/USB/IRQ_RF"
+Ne 2 "/RF/IRQ_RF"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_2mm
@@ -1214,7 +1209,7 @@ $PAD
 Sh "1" O 786 196 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 8 "/RF/nSS"
+Ne 9 "/RF/nSS"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_2mm
@@ -1231,7 +1226,7 @@ $PAD
 Sh "1" O 786 196 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 5 "/RF/SCLK"
+Ne 6 "/RF/SCLK"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_2mm
@@ -1265,7 +1260,7 @@ $PAD
 Sh "1" O 786 196 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 2 "/RF/MOSI"
+Ne 3 "/RF/MOSI"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_2mm
@@ -1282,7 +1277,7 @@ $PAD
 Sh "1" O 786 196 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "VDD"
+Ne 29 "VDD"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_2mm
@@ -1299,7 +1294,7 @@ $PAD
 Sh "1" O 600 600 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 20 "N-000020"
+Ne 2 "/RF/IRQ_RF"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_60x60
@@ -1328,7 +1323,7 @@ $PAD
 Sh "1" R 355 98 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 20 "N-000020"
+Ne 2 "/RF/IRQ_RF"
 Po -944 -590
 $EndPAD
 $PAD
@@ -1342,28 +1337,28 @@ $PAD
 Sh "3" R 355 99 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 11 "/USB/D+"
+Ne 12 "/USB/D+"
 Po -944 -196
 $EndPAD
 $PAD
 Sh "4" R 355 98 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 12 "/USB/D-"
+Ne 13 "/USB/D-"
 Po -944 0
 $EndPAD
 $PAD
 Sh "5" R 355 99 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "VDD"
+Ne 29 "VDD"
 Po -944 196
 $EndPAD
 $PAD
 Sh "6" R 355 98 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "VDD"
+Ne 29 "VDD"
 Po -944 393
 $EndPAD
 $PAD
@@ -1384,28 +1379,28 @@ $PAD
 Sh "9" R 98 355 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 9 "/USB/C2CK"
+Ne 10 "/USB/C2CK"
 Po -393 944
 $EndPAD
 $PAD
 Sh "10" R 99 355 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 10 "/USB/C2D"
+Ne 11 "/USB/C2D"
 Po -196 944
 $EndPAD
 $PAD
 Sh "11" R 98 355 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 8 "/RF/nSS"
+Ne 9 "/RF/nSS"
 Po 0 944
 $EndPAD
 $PAD
 Sh "12" R 99 355 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 2 "/RF/MOSI"
+Ne 3 "/RF/MOSI"
 Po 196 944
 $EndPAD
 $PAD
@@ -1440,14 +1435,14 @@ $PAD
 Sh "17" R 355 99 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 5 "/RF/SCLK"
+Ne 6 "/RF/SCLK"
 Po 944 196
 $EndPAD
 $PAD
 Sh "18" R 355 98 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 6 "/RF/SLP_TR"
+Ne 7 "/RF/SLP_TR"
 Po 944 0
 $EndPAD
 $PAD
@@ -1510,14 +1505,14 @@ $PAD
 Sh "27" R 98 355 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 13 "/USB/IRQ_RF"
+Ne 0 ""
 Po -393 -944
 $EndPAD
 $PAD
 Sh "28" R 98 355 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 19 "N-000017"
+Ne 18 "N-000009"
 Po -590 -944
 $EndPAD
 $PAD
@@ -1574,14 +1569,14 @@ $PAD
 Sh "4" R 355 114 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 4 "/RF/RPF"
+Ne 5 "/RF/RPF"
 Po -1003 -98
 $EndPAD
 $PAD
 Sh "5" R 355 114 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 3 "/RF/RFN"
+Ne 4 "/RF/RFN"
 Po -1003 98
 $EndPAD
 $PAD
@@ -1595,7 +1590,7 @@ $PAD
 Sh "7" R 355 114 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 7 "/RF/TST"
+Ne 8 "/RF/TST"
 Po -1003 492
 $EndPAD
 $PAD
@@ -1623,7 +1618,7 @@ $PAD
 Sh "11" R 114 355 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 6 "/RF/SLP_TR"
+Ne 7 "/RF/SLP_TR"
 Po -295 1003
 $EndPAD
 $PAD
@@ -1637,21 +1632,21 @@ $PAD
 Sh "13" R 114 355 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 23 "N-000025"
+Ne 22 "N-000025"
 Po 98 1003
 $EndPAD
 $PAD
 Sh "14" R 114 355 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 23 "N-000025"
+Ne 22 "N-000025"
 Po 295 1003
 $EndPAD
 $PAD
 Sh "15" R 114 355 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "VDD"
+Ne 29 "VDD"
 Po 492 1003
 $EndPAD
 $PAD
@@ -1679,7 +1674,7 @@ $PAD
 Sh "19" R 355 114 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 5 "/RF/SCLK"
+Ne 6 "/RF/SCLK"
 Po 1003 295
 $EndPAD
 $PAD
@@ -1700,35 +1695,35 @@ $PAD
 Sh "22" R 355 114 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 2 "/RF/MOSI"
+Ne 3 "/RF/MOSI"
 Po 1003 -295
 $EndPAD
 $PAD
 Sh "23" R 355 114 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 8 "/RF/nSS"
+Ne 9 "/RF/nSS"
 Po 1003 -492
 $EndPAD
 $PAD
 Sh "24" R 355 115 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 13 "/USB/IRQ_RF"
+Ne 2 "/RF/IRQ_RF"
 Po 1003 -688
 $EndPAD
 $PAD
 Sh "25" R 115 355 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 28 "N-000035"
+Ne 27 "N-000035"
 Po 688 -1003
 $EndPAD
 $PAD
 Sh "26" R 114 355 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 26 "N-000030"
+Ne 25 "N-000030"
 Po 492 -1003
 $EndPAD
 $PAD
@@ -1742,14 +1737,14 @@ $PAD
 Sh "28" R 114 355 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 30 "VDD"
+Ne 29 "VDD"
 Po 98 -1003
 $EndPAD
 $PAD
 Sh "29" R 114 355 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 24 "N-000027"
+Ne 23 "N-000027"
 Po -98 -1003
 $EndPAD
 $PAD
@@ -1798,7 +1793,7 @@ $PAD
 Sh "1" R 551 473 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 28 "N-000035"
+Ne 27 "N-000035"
 Po -432 314
 $EndPAD
 $PAD
@@ -1812,7 +1807,7 @@ $PAD
 Sh "3" R 551 473 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 26 "N-000030"
+Ne 25 "N-000030"
 Po 432 -314
 $EndPAD
 $PAD
@@ -1840,14 +1835,14 @@ $PAD
 Sh "1" R 157 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 29 "N-000036"
+Ne 28 "N-000036"
 Po -176 0
 $EndPAD
 $PAD
 Sh "2" R 157 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "N-000024"
+Ne 21 "N-000024"
 Po 176 0
 $EndPAD
 $EndMODULE  0402
@@ -1881,7 +1876,7 @@ $PAD
 Sh "1" O 600 600 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 7 "/RF/TST"
+Ne 8 "/RF/TST"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_60x60
@@ -1913,7 +1908,7 @@ Po 50600 35800 600 600 100 0
 De 15 1 0 Normal
 $EndTEXTPCB
 $TEXTPCB
-Te "100818"
+Te "100820"
 Po 51700 34900 600 600 100 0
 De 0 0 0 Normal
 $EndTEXTPCB
@@ -2056,177 +2051,183 @@ Po 0 51697 37012 51112 37012 80 -1
 De 15 0 1 0 800
 Po 0 51112 37012 51100 37000 80 -1
 De 15 0 1 0 400
-Po 0 49800 38000 50200 38000 80 -1
-De 15 0 2 0 800
-Po 0 51095 37995 51697 37995 80 -1
-De 15 0 2 0 400
-Po 0 51000 37900 51095 37995 80 -1
-De 15 0 2 0 0
-Po 0 50300 37900 51000 37900 80 -1
-De 15 0 2 0 0
-Po 0 50200 38000 50300 37900 80 -1
-De 15 0 2 0 0
-Po 0 46996 38144 46996 38396 80 -1
-De 15 0 2 0 800
-Po 0 48100 38000 49800 38000 80 -1
-De 15 0 2 0 400
-Po 0 47600 38500 48100 38000 80 -1
-De 15 0 2 0 0
-Po 0 47100 38500 47600 38500 80 -1
-De 15 0 2 0 0
-Po 0 46996 38396 47100 38500 80 -1
-De 15 0 2 0 0
-Po 0 53703 37602 54098 37602 80 -1
-De 15 0 3 0 800
-Po 0 54200 37500 54424 37500 80 -1
-De 15 0 3 0 400
-Po 0 54098 37602 54200 37500 80 -1
-De 15 0 3 0 0
-Po 0 53703 37798 54098 37798 80 -1
-De 15 0 4 0 800
-Po 0 54200 37900 54424 37900 80 -1
-De 15 0 4 0 400
-Po 0 54098 37798 54200 37900 80 -1
-De 15 0 4 0 0
-Po 0 51697 37405 51295 37405 80 -1
-De 15 0 5 0 800
-Po 0 50800 37400 49800 37400 80 -1
-De 15 0 5 0 400
-Po 0 50900 37500 50800 37400 80 -1
-De 15 0 5 0 0
-Po 0 51200 37500 50900 37500 80 -1
-De 15 0 5 0 0
-Po 0 51295 37405 51200 37500 80 -1
-De 15 0 5 0 0
-Po 0 47744 37396 49796 37396 80 -1
-De 15 0 5 0 800
-Po 0 49796 37396 49800 37400 80 -1
-De 15 0 5 0 400
-Po 0 50500 37100 50600 37100 80 -1
-De 0 0 6 0 0
-Po 3 50500 37100 50500 37100 300 -1
-De 15 1 6 0 0
-Po 3 53200 36200 53200 36200 300 -1
-De 15 1 6 0 0
-Po 0 53200 36200 52995 36405 80 -1
-De 15 0 6 0 0
-Po 0 52995 36697 52995 36405 80 -1
-De 15 0 6 0 800
-Po 0 50500 37100 49800 37100 80 -1
-De 15 0 6 0 400
-Po 0 52900 35900 53200 36200 80 -1
-De 0 0 6 0 0
-Po 0 51800 35900 52900 35900 80 -1
-De 0 0 6 0 0
-Po 0 50600 37100 51800 35900 80 -1
-De 0 0 6 0 0
-Po 0 47744 37200 48100 37200 80 -1
-De 15 0 6 0 800
-Po 0 48200 37100 49800 37100 80 -1
-De 15 0 6 0 400
-Po 0 48100 37200 48200 37100 80 -1
-De 15 0 6 0 0
-Po 0 54076 36100 54500 36100 80 -1
-De 15 0 7 0 800
-Po 0 54500 36100 54700 36300 80 -1
-De 15 0 7 0 400
-Po 0 53703 37208 53933 37208 80 -1
-De 15 0 7 0 800
-Po 0 54076 37065 54076 36800 80 -1
-De 15 0 7 0 0
-Po 0 54076 36800 54076 36100 80 -1
-De 15 0 7 0 400
-Po 0 53933 37208 54076 37065 80 -1
-De 15 0 7 0 0
-Po 0 49800 38300 50200 38300 80 -1
-De 15 0 8 0 800
-Po 0 50992 38192 51697 38192 80 -1
-De 15 0 8 0 400
-Po 0 50900 38100 50992 38192 80 -1
-De 15 0 8 0 0
-Po 0 50400 38100 50900 38100 80 -1
-De 15 0 8 0 0
-Po 0 50200 38300 50400 38100 80 -1
-De 15 0 8 0 0
-Po 0 46800 38144 46800 38500 80 -1
-De 15 0 8 0 800
-Po 0 48100 38300 49800 38300 80 -1
-De 15 0 8 0 400
-Po 0 47700 38700 48100 38300 80 -1
-De 15 0 8 0 0
-Po 0 47000 38700 47700 38700 80 -1
-De 15 0 8 0 0
-Po 0 46800 38500 47000 38700 80 -1
-De 15 0 8 0 0
-Po 0 46407 38144 46407 38707 80 -1
-De 15 0 9 0 800
-Po 0 46700 39000 46700 39600 80 -1
-De 15 0 9 0 400
-Po 0 46407 38707 46700 39000 80 -1
-De 15 0 9 0 0
-Po 0 46604 38144 46604 38604 80 -1
-De 15 0 10 0 800
-Po 0 47700 39200 47700 39600 80 -1
-De 15 0 10 0 400
-Po 0 47400 38900 47700 39200 80 -1
-De 15 0 10 0 0
-Po 0 46900 38900 47400 38900 80 -1
-De 15 0 10 0 0
-Po 0 46604 38604 46900 38900 80 -1
-De 15 0 10 0 0
-Po 0 43748 36800 44494 36800 80 -1
-De 15 0 11 0 800
-Po 0 44494 36800 44700 37006 80 -1
-De 15 0 11 0 400
-Po 0 45856 37004 44702 37004 80 -1
-De 15 0 11 0 800
-Po 0 44702 37004 44700 37006 80 -1
-De 15 0 11 0 400
-Po 0 45856 37200 45300 37200 80 -1
-De 15 0 12 0 800
-Po 3 45200 37300 45200 37300 300 -1
-De 15 1 12 0 0
-Po 0 44994 36494 44700 36494 80 -1
-De 15 0 12 0 400
-Po 3 45200 36700 45200 36700 300 -1
-De 15 1 12 0 0
-Po 0 44994 36494 45200 36700 80 -1
-De 15 0 12 0 0
-Po 0 45200 37300 45200 36700 80 -1
-De 0 0 12 0 0
-Po 0 45300 37200 45200 37300 80 -1
-De 15 0 12 0 0
-Po 0 43748 36486 44286 36486 80 -1
-De 15 0 12 0 800
-Po 0 44294 36494 44700 36494 80 -1
-De 15 0 12 0 400
-Po 0 44286 36486 44294 36494 80 -1
-De 15 0 12 0 0
-Po 0 49800 38600 50200 38600 80 -1
-De 15 0 13 0 800
-Po 0 50888 38388 51697 38388 80 -1
-De 15 0 13 0 400
-Po 0 50800 38300 50888 38388 80 -1
-De 15 0 13 0 0
-Po 0 50500 38300 50800 38300 80 -1
-De 15 0 13 0 0
-Po 0 50200 38600 50500 38300 80 -1
-De 15 0 13 0 0
-Po 0 46407 36256 46407 35924 80 -1
-De 15 0 13 0 800
-Po 0 48200 38600 49800 38600 80 -1
-De 15 0 13 0 400
+Po 0 48200 38600 48200 36300 80 -1
+De 0 0 2 0 0
 Po 3 48200 38600 48200 38600 300 -1
+De 15 1 2 0 0
+Po 0 49800 38600 48200 38600 80 -1
+De 15 0 2 0 800
+Po 0 45900 36000 45700 36000 80 -1
+De 15 0 2 0 400
+Po 0 46500 35400 45900 36000 80 -1
+De 15 0 2 0 0
+Po 0 47300 35400 46500 35400 80 -1
+De 15 0 2 0 0
+Po 3 47300 35400 47300 35400 300 -1
+De 15 1 2 0 0
+Po 0 48200 36300 47300 35400 80 -1
+De 0 0 2 0 0
+Po 0 49800 38600 50200 38600 80 -1
+De 15 0 2 0 800
+Po 0 50888 38388 51697 38388 80 -1
+De 15 0 2 0 400
+Po 0 50800 38300 50888 38388 80 -1
+De 15 0 2 0 0
+Po 0 50500 38300 50800 38300 80 -1
+De 15 0 2 0 0
+Po 0 50200 38600 50500 38300 80 -1
+De 15 0 2 0 0
+Po 0 45856 36610 45710 36610 80 -1
+De 15 0 2 0 800
+Po 0 45710 36610 45700 36600 80 -1
+De 15 0 2 0 0
+Po 0 45700 36600 45700 36000 80 -1
+De 15 0 2 0 400
+Po 0 49800 38000 50200 38000 80 -1
+De 15 0 3 0 800
+Po 0 51095 37995 51697 37995 80 -1
+De 15 0 3 0 400
+Po 0 51000 37900 51095 37995 80 -1
+De 15 0 3 0 0
+Po 0 50300 37900 51000 37900 80 -1
+De 15 0 3 0 0
+Po 0 50200 38000 50300 37900 80 -1
+De 15 0 3 0 0
+Po 0 46996 38144 46996 38396 80 -1
+De 15 0 3 0 800
+Po 0 48100 38000 49800 38000 80 -1
+De 15 0 3 0 400
+Po 0 47600 38500 48100 38000 80 -1
+De 15 0 3 0 0
+Po 0 47100 38500 47600 38500 80 -1
+De 15 0 3 0 0
+Po 0 46996 38396 47100 38500 80 -1
+De 15 0 3 0 0
+Po 0 53703 37602 54098 37602 80 -1
+De 15 0 4 0 800
+Po 0 54200 37500 54424 37500 80 -1
+De 15 0 4 0 400
+Po 0 54098 37602 54200 37500 80 -1
+De 15 0 4 0 0
+Po 0 53703 37798 54098 37798 80 -1
+De 15 0 5 0 800
+Po 0 54200 37900 54424 37900 80 -1
+De 15 0 5 0 400
+Po 0 54098 37798 54200 37900 80 -1
+De 15 0 5 0 0
+Po 0 51697 37405 51295 37405 80 -1
+De 15 0 6 0 800
+Po 0 50800 37400 49800 37400 80 -1
+De 15 0 6 0 400
+Po 0 50900 37500 50800 37400 80 -1
+De 15 0 6 0 0
+Po 0 51200 37500 50900 37500 80 -1
+De 15 0 6 0 0
+Po 0 51295 37405 51200 37500 80 -1
+De 15 0 6 0 0
+Po 0 47744 37396 49796 37396 80 -1
+De 15 0 6 0 800
+Po 0 49796 37396 49800 37400 80 -1
+De 15 0 6 0 400
+Po 0 50500 37100 50600 37100 80 -1
+De 0 0 7 0 0
+Po 3 50500 37100 50500 37100 300 -1
+De 15 1 7 0 0
+Po 3 53200 36200 53200 36200 300 -1
+De 15 1 7 0 0
+Po 0 53200 36200 52995 36405 80 -1
+De 15 0 7 0 0
+Po 0 52995 36697 52995 36405 80 -1
+De 15 0 7 0 800
+Po 0 50500 37100 49800 37100 80 -1
+De 15 0 7 0 400
+Po 0 52900 35900 53200 36200 80 -1
+De 0 0 7 0 0
+Po 0 51800 35900 52900 35900 80 -1
+De 0 0 7 0 0
+Po 0 50600 37100 51800 35900 80 -1
+De 0 0 7 0 0
+Po 0 47744 37200 48100 37200 80 -1
+De 15 0 7 0 800
+Po 0 48200 37100 49800 37100 80 -1
+De 15 0 7 0 400
+Po 0 48100 37200 48200 37100 80 -1
+De 15 0 7 0 0
+Po 0 54076 36100 54500 36100 80 -1
+De 15 0 8 0 800
+Po 0 54500 36100 54700 36300 80 -1
+De 15 0 8 0 400
+Po 0 53703 37208 53933 37208 80 -1
+De 15 0 8 0 800
+Po 0 54076 37065 54076 36800 80 -1
+De 15 0 8 0 0
+Po 0 54076 36800 54076 36100 80 -1
+De 15 0 8 0 400
+Po 0 53933 37208 54076 37065 80 -1
+De 15 0 8 0 0
+Po 0 49800 38300 50200 38300 80 -1
+De 15 0 9 0 800
+Po 0 50992 38192 51697 38192 80 -1
+De 15 0 9 0 400
+Po 0 50900 38100 50992 38192 80 -1
+De 15 0 9 0 0
+Po 0 50400 38100 50900 38100 80 -1
+De 15 0 9 0 0
+Po 0 50200 38300 50400 38100 80 -1
+De 15 0 9 0 0
+Po 0 46800 38144 46800 38500 80 -1
+De 15 0 9 0 800
+Po 0 48100 38300 49800 38300 80 -1
+De 15 0 9 0 400
+Po 0 47700 38700 48100 38300 80 -1
+De 15 0 9 0 0
+Po 0 47000 38700 47700 38700 80 -1
+De 15 0 9 0 0
+Po 0 46800 38500 47000 38700 80 -1
+De 15 0 9 0 0
+Po 0 46407 38144 46407 38707 80 -1
+De 15 0 10 0 800
+Po 0 46700 39000 46700 39600 80 -1
+De 15 0 10 0 400
+Po 0 46407 38707 46700 39000 80 -1
+De 15 0 10 0 0
+Po 0 46604 38144 46604 38604 80 -1
+De 15 0 11 0 800
+Po 0 47700 39200 47700 39600 80 -1
+De 15 0 11 0 400
+Po 0 47400 38900 47700 39200 80 -1
+De 15 0 11 0 0
+Po 0 46900 38900 47400 38900 80 -1
+De 15 0 11 0 0
+Po 0 46604 38604 46900 38900 80 -1
+De 15 0 11 0 0
+Po 0 43748 36800 44494 36800 80 -1
+De 15 0 12 0 800
+Po 0 44494 36800 44700 37006 80 -1
+De 15 0 12 0 400
+Po 0 45856 37004 44702 37004 80 -1
+De 15 0 12 0 800
+Po 0 44702 37004 44700 37006 80 -1
+De 15 0 12 0 400
+Po 0 45856 37200 45300 37200 80 -1
+De 15 0 13 0 800
+Po 3 45200 37300 45200 37300 300 -1
 De 15 1 13 0 0
-Po 0 48200 37300 48200 38600 80 -1
-De 0 0 13 0 0
-Po 0 46700 35800 48200 37300 80 -1
-De 0 0 13 0 0
-Po 3 46700 35800 46700 35800 300 -1
+Po 0 44994 36494 44700 36494 80 -1
+De 15 0 13 0 400
+Po 3 45200 36700 45200 36700 300 -1
 De 15 1 13 0 0
-Po 0 46531 35800 46700 35800 80 -1
+Po 0 44994 36494 45200 36700 80 -1
 De 15 0 13 0 0
-Po 0 46407 35924 46531 35800 80 -1
+Po 0 45200 37300 45200 36700 80 -1
+De 0 0 13 0 0
+Po 0 45300 37200 45200 37300 80 -1
+De 15 0 13 0 0
+Po 0 43748 36486 44286 36486 80 -1
+De 15 0 13 0 800
+Po 0 44294 36494 44700 36494 80 -1
+De 15 0 13 0 400
+Po 0 44286 36486 44294 36494 80 -1
 De 15 0 13 0 0
 Po 0 51697 37602 51398 37602 80 -1
 De 15 0 14 0 800
@@ -2578,190 +2579,178 @@ Po 0 41543 38551 43708 38551 80 -1
 De 15 0 17 0 C00
 Po 0 41543 35049 43708 35049 80 -1
 De 15 0 17 0 C00
-Po 0 46606 35200 46400 35200 80 -1
+Po 0 46210 36256 46210 35990 80 -1
 De 15 0 18 0 800
-Po 0 46206 35394 45900 35394 80 -1
+Po 0 46506 35694 46700 35694 80 -1
 De 15 0 18 0 400
-Po 0 46400 35200 46206 35394 80 -1
+Po 0 46210 35990 46506 35694 80 -1
 De 15 0 18 0 0
-Po 0 46210 36256 46210 35790 80 -1
+Po 0 45900 35394 46106 35394 80 -1
 De 15 0 19 0 800
-Po 0 47200 35206 47194 35200 80 -1
+Po 0 46394 35106 46700 35106 80 -1
 De 15 0 19 0 400
-Po 0 47200 35400 47200 35206 80 -1
+Po 0 46106 35394 46394 35106 80 -1
 De 15 0 19 0 0
-Po 0 47100 35500 47200 35400 80 -1
-De 15 0 19 0 0
-Po 0 46500 35500 47100 35500 80 -1
-De 15 0 19 0 0
-Po 0 46210 35790 46500 35500 80 -1
-De 15 0 19 0 0
-Po 0 45856 36610 45710 36610 80 -1
-De 15 0 20 0 800
-Po 0 45700 36600 45700 36000 80 -1
-De 15 0 20 0 400
-Po 0 45710 36610 45700 36600 80 -1
-De 15 0 20 0 0
 Po 0 54776 37100 55176 37100 80 -1
-De 15 0 21 0 800
+De 15 0 20 0 800
 Po 0 55176 37100 55200 37124 80 -1
-De 15 0 21 0 400
+De 15 0 20 0 400
 Po 0 54776 37100 54776 37500 80 -1
-De 15 0 21 0 C00
+De 15 0 20 0 C00
 Po 0 55200 37924 55324 37924 80 -1
-De 15 0 22 0 800
+De 15 0 21 0 800
 Po 0 55024 38776 55024 38900 80 -1
-De 15 0 22 0 400
+De 15 0 21 0 400
 Po 0 55200 38600 55024 38776 80 -1
-De 15 0 22 0 0
+De 15 0 21 0 0
 Po 0 55300 38600 55200 38600 80 -1
-De 15 0 22 0 0
+De 15 0 21 0 0
 Po 0 55500 38400 55300 38600 80 -1
-De 15 0 22 0 0
+De 15 0 21 0 0
 Po 0 55500 38100 55500 38400 80 -1
-De 15 0 22 0 0
+De 15 0 21 0 0
 Po 0 55324 37924 55500 38100 80 -1
-De 15 0 22 0 0
+De 15 0 21 0 0
 Po 0 55000 39324 55000 38924 80 -1
-De 15 0 22 0 800
+De 15 0 21 0 800
 Po 0 55000 38924 55024 38900 80 -1
-De 15 0 22 0 400
+De 15 0 21 0 400
 Po 0 55200 37476 55200 37924 80 -1
-De 15 0 22 0 C00
+De 15 0 21 0 C00
 Po 0 52602 36697 52602 36502 80 -1
-De 15 0 23 0 800
+De 15 0 22 0 800
 Po 0 52486 36386 52424 36386 80 -1
-De 15 0 23 0 0
+De 15 0 22 0 0
 Po 0 52602 36502 52486 36386 80 -1
-De 15 0 23 0 0
+De 15 0 22 0 0
 Po 0 52405 36697 52405 36405 80 -1
-De 15 0 23 0 800
+De 15 0 22 0 800
 Po 0 52424 36386 52424 36100 80 -1
-De 15 0 23 0 400
+De 15 0 22 0 400
 Po 0 52405 36405 52424 36386 80 -1
-De 15 0 23 0 0
+De 15 0 22 0 0
 Po 0 52798 38703 52798 39174 80 -1
-De 15 0 24 0 800
+De 15 0 23 0 800
 Po 0 52798 39174 52824 39200 80 -1
-De 15 0 24 0 400
+De 15 0 23 0 400
 Po 0 55800 39676 57224 39676 80 -1
-De 15 0 25 0 800
+De 15 0 24 0 800
 Po 0 57326 39574 57326 39161 80 -1
-De 15 0 25 0 400
+De 15 0 24 0 400
 Po 0 57224 39676 57326 39574 80 -1
-De 15 0 25 0 0
+De 15 0 24 0 0
 Po 0 51824 39400 51824 39794 80 -1
-De 15 0 26 0 800
+De 15 0 25 0 800
 Po 0 51824 39794 51732 39886 80 -1
-De 15 0 26 0 400
+De 15 0 25 0 400
 Po 0 52208 38703 52208 38992 80 -1
-De 15 0 26 0 800
+De 15 0 25 0 800
 Po 0 51824 39376 51824 39400 80 -1
-De 15 0 26 0 400
+De 15 0 25 0 400
 Po 0 52208 38992 51824 39376 80 -1
-De 15 0 26 0 0
+De 15 0 25 0 0
 Po 0 55800 39324 55400 39324 80 -1
-De 15 0 27 0 C00
+De 15 0 26 0 C00
 Po 0 55400 39324 55400 38924 80 -1
-De 15 0 27 0 800
+De 15 0 26 0 800
 Po 0 55400 38924 55376 38900 80 -1
-De 15 0 27 0 400
+De 15 0 26 0 400
 Po 0 50868 40514 50986 40514 80 -1
-De 15 0 28 0 800
+De 15 0 27 0 800
 Po 0 51376 39524 51376 39400 80 -1
-De 15 0 28 0 400
+De 15 0 27 0 400
 Po 0 51300 39600 51376 39524 80 -1
-De 15 0 28 0 0
+De 15 0 27 0 0
 Po 0 51300 40200 51300 39600 80 -1
-De 15 0 28 0 0
+De 15 0 27 0 0
 Po 0 50986 40514 51300 40200 80 -1
-De 15 0 28 0 0
+De 15 0 27 0 0
 Po 0 52012 38703 52012 38888 80 -1
-De 15 0 28 0 800
+De 15 0 27 0 800
 Po 0 51376 39324 51376 39400 80 -1
-De 15 0 28 0 400
+De 15 0 27 0 400
 Po 0 51600 39100 51376 39324 80 -1
-De 15 0 28 0 0
+De 15 0 27 0 0
 Po 0 51800 39100 51600 39100 80 -1
-De 15 0 28 0 0
+De 15 0 27 0 0
 Po 0 52012 38888 51800 39100 80 -1
-De 15 0 28 0 0
+De 15 0 27 0 0
 Po 0 54776 38300 55176 38300 80 -1
-De 15 0 29 0 800
+De 15 0 28 0 800
 Po 0 55176 38300 55200 38276 80 -1
-De 15 0 29 0 400
+De 15 0 28 0 400
 Po 0 54776 37900 54776 38300 80 -1
-De 15 0 29 0 C00
+De 15 0 28 0 C00
 Po 0 44700 38106 44994 38106 80 -1
-De 15 0 30 0 800
+De 15 0 29 0 800
 Po 0 44994 38106 45200 37900 80 -1
-De 15 0 30 0 0
+De 15 0 29 0 0
 Po 0 45507 37593 45200 37900 80 -1
-De 15 0 30 0 0
+De 15 0 29 0 0
 Po 0 48300 38900 49800 38900 80 -1
-De 15 0 30 0 400
+De 15 0 29 0 400
 Po 0 48200 39000 48300 38900 80 -1
-De 15 0 30 0 0
+De 15 0 29 0 0
 Po 3 48200 39000 48200 39000 300 -1
-De 15 1 30 0 0
+De 15 1 29 0 0
 Po 0 47800 38600 48200 39000 80 -1
-De 0 0 30 0 0
+De 0 0 29 0 0
 Po 0 45500 38600 47800 38600 80 -1
-De 0 0 30 0 0
+De 0 0 29 0 0
 Po 0 45200 38300 45500 38600 80 -1
-De 0 0 30 0 0
+De 0 0 29 0 0
 Po 0 45200 37900 45200 38300 80 -1
-De 0 0 30 0 0
+De 0 0 29 0 0
 Po 3 45200 37900 45200 37900 300 -1
-De 15 1 30 0 0
+De 15 1 29 0 0
 Po 0 45856 37396 45604 37396 80 -1
-De 15 0 30 0 800
+De 15 0 29 0 800
 Po 0 45507 37493 45507 37593 80 -1
-De 15 0 30 0 0
+De 15 0 29 0 0
 Po 0 45604 37396 45507 37493 80 -1
-De 15 0 30 0 0
+De 15 0 29 0 0
 Po 0 45856 37593 45507 37593 80 -1
-De 15 0 30 0 800
+De 15 0 29 0 800
 Po 0 52208 36697 52208 36308 80 -1
-De 15 0 30 0 800
+De 15 0 29 0 800
 Po 0 52208 36308 52100 36200 80 -1
-De 15 0 30 0 0
+De 15 0 29 0 0
 Po 0 51776 36100 52000 36100 80 -1
-De 15 0 30 0 800
+De 15 0 29 0 800
 Po 0 52100 36200 52100 38100 80 -1
-De 0 0 30 0 0
+De 0 0 29 0 0
 Po 3 52100 36200 52100 36200 300 -1
-De 15 1 30 0 0
+De 15 1 29 0 0
 Po 0 52000 36100 52100 36200 80 -1
-De 15 0 30 0 0
+De 15 0 29 0 0
 Po 0 50700 38600 51200 38100 80 -1
-De 0 0 30 0 0
+De 0 0 29 0 0
 Po 0 51200 38100 52100 38100 80 -1
-De 0 0 30 0 0
+De 0 0 29 0 0
 Po 0 49800 38900 50200 38900 80 -1
-De 15 0 30 0 800
+De 15 0 29 0 800
 Po 3 50700 38600 50700 38600 300 -1
-De 15 1 30 0 0
+De 15 1 29 0 0
 Po 0 50500 38600 50700 38600 80 -1
-De 15 0 30 0 0
+De 15 0 29 0 0
 Po 0 50200 38900 50500 38600 80 -1
-De 15 0 30 0 0
+De 15 0 29 0 0
 Po 0 52824 40124 52824 39700 80 -1
-De 15 0 30 0 400
+De 15 0 29 0 400
 Po 0 52900 40200 52824 40124 80 -1
-De 15 0 30 0 0
+De 15 0 29 0 0
 Po 3 52900 40200 52900 40200 300 -1
-De 15 1 30 0 0
+De 15 1 29 0 0
 Po 0 52900 38600 52900 40200 80 -1
-De 0 0 30 0 0
+De 0 0 29 0 0
 Po 0 52400 38100 52900 38600 80 -1
-De 0 0 30 0 0
+De 0 0 29 0 0
 Po 0 52100 38100 52400 38100 80 -1
-De 0 0 30 0 0
+De 0 0 29 0 0
 Po 0 52602 38703 52602 39478 80 -1
-De 15 0 30 0 800
+De 15 0 29 0 800
 Po 0 52602 39478 52824 39700 80 -1
-De 15 0 30 0 400
+De 15 0 29 0 400
 $EndTRACK
 $ZONE
 $EndZONE
@@ -2860,26 +2849,28 @@ $POLYSCORNERS
 47944 38524 0 0
 47976 38449 0 0
 48045 38380 0 0
-48045 37364 0 0
-46745 36065 0 0
-46647 36065 0 0
-46549 36024 0 0
-46475 35949 0 0
-46435 35852 0 0
-46435 35747 0 0
-46476 35649 0 0
-46551 35575 0 0
-46648 35535 0 0
-46753 35535 0 0
-46851 35576 0 0
-46925 35651 0 0
-46965 35748 0 0
-46965 35845 0 0
-48307 37188 0 0
-48310 37190 0 0
-48329 37220 0 0
-48343 37240 0 0
-48355 37300 0 0
+48045 36364 0 0
+47345 35665 0 0
+47247 35665 0 0
+47149 35624 0 0
+47075 35549 0 0
+47035 35452 0 0
+47035 35347 0 0
+47076 35249 0 0
+47151 35175 0 0
+47248 35135 0 0
+47353 35135 0 0
+47451 35176 0 0
+47525 35251 0 0
+47565 35348 0 0
+47565 35445 0 0
+48307 36188 0 0
+48310 36190 0 0
+48343 36241 0 0
+48352 36286 0 0
+48355 36299 0 0
+48354 36299 0 0
+48355 36300 0 0
 48355 38380 0 0
 48425 38451 0 0
 48465 38548 0 0
@@ -2910,111 +2901,118 @@ $FILLSEGMENTS
 40855 35015 48765 35015
 40855 35071 48765 35071
 40855 35127 48765 35127
-40855 35183 48765 35183
-40855 35239 48765 35239
-40855 35295 48765 35295
-40855 35351 48765 35351
-40855 35407 48765 35407
-40855 35463 48765 35463
-40855 35519 48765 35519
+40855 35183 47143 35183
+47458 35183 48765 35183
+40855 35239 47087 35239
+47514 35239 48765 35239
+40855 35295 47057 35295
+47544 35295 48765 35295
+40855 35351 47035 35351
+47565 35351 48765 35351
+40855 35407 47035 35407
+47565 35407 48765 35407
+40855 35463 47039 35463
+47583 35463 48765 35463
+40855 35519 47062 35519
+47639 35519 48765 35519
 40855 35575 45051 35575
-45349 35575 46551 35575
-46849 35575 48765 35575
+45349 35575 47100 35575
+47695 35575 48765 35575
 40855 35631 44995 35631
-45406 35631 46495 35631
-46906 35631 48765 35631
+45406 35631 47165 35631
+47751 35631 48765 35631
 40855 35687 44961 35687
-45440 35687 46461 35687
-46940 35687 48765 35687
+45440 35687 47367 35687
+47807 35687 48765 35687
 40855 35743 44937 35743
-45463 35743 46437 35743
-46963 35743 48765 35743
+45463 35743 47423 35743
+47863 35743 48765 35743
 40855 35799 44935 35799
-45519 35799 46435 35799
-46965 35799 48765 35799
+45519 35799 47479 35799
+47919 35799 48765 35799
 40855 35855 44936 35855
-45575 35855 46436 35855
-46975 35855 48765 35855
+45575 35855 47535 35855
+47975 35855 48765 35855
 40855 35911 44959 35911
-45631 35911 46459 35911
-47031 35911 48765 35911
+45631 35911 47591 35911
+48031 35911 48765 35911
 40855 35967 44992 35967
-45687 35967 46492 35967
-47087 35967 48765 35967
+45687 35967 47647 35967
+48087 35967 48765 35967
 40855 36023 45048 36023
-45732 36023 46548 36023
-47143 36023 48765 36023
+45732 36023 47703 36023
+48143 36023 48765 36023
 40855 36079 45360 36079
-45751 36079 46759 36079
-47199 36079 48765 36079
+45751 36079 47759 36079
+48199 36079 48765 36079
 40855 36135 45416 36135
-45755 36135 46815 36135
-47255 36135 48765 36135
+45755 36135 47815 36135
+48255 36135 48765 36135
 40855 36191 45445 36191
-45755 36191 46871 36191
-47311 36191 48765 36191
+45755 36191 47871 36191
+48311 36191 48765 36191
 40855 36247 45445 36247
-45755 36247 46927 36247
-47367 36247 48765 36247
+45755 36247 47927 36247
+48345 36247 48765 36247
 40855 36303 45445 36303
-45755 36303 46983 36303
-47423 36303 48765 36303
+45755 36303 47983 36303
+48355 36303 48765 36303
 40855 36359 45445 36359
-45755 36359 47039 36359
-47479 36359 48765 36359
+45755 36359 48039 36359
+48355 36359 48765 36359
 40855 36415 45445 36415
-45755 36415 47095 36415
-47535 36415 48765 36415
+45755 36415 48045 36415
+48355 36415 48765 36415
 40855 36471 45061 36471
 45340 36471 45445 36471
-45755 36471 47151 36471
-47591 36471 48765 36471
+45755 36471 48045 36471
+48355 36471 48765 36471
 40855 36527 44999 36527
 45402 36527 45445 36527
-45755 36527 47207 36527
-47647 36527 48765 36527
+45755 36527 48045 36527
+48355 36527 48765 36527
 40855 36583 44962 36583
 45439 36583 45445 36583
-45755 36583 47263 36583
-47703 36583 48765 36583
+45755 36583 48045 36583
+48355 36583 48765 36583
 40855 36639 44939 36639
-45755 36639 47319 36639
-47759 36639 48765 36639
+45755 36639 48045 36639
+48355 36639 48765 36639
 40855 36695 44935 36695
-45755 36695 47375 36695
-47815 36695 48765 36695
+45755 36695 48045 36695
+48355 36695 48765 36695
 40855 36751 44935 36751
-45755 36751 47431 36751
-47871 36751 48765 36751
+45755 36751 48045 36751
+48355 36751 48765 36751
 40855 36807 44957 36807
-45755 36807 47487 36807
-47927 36807 48765 36807
+45755 36807 48045 36807
+48355 36807 48765 36807
 40855 36863 44989 36863
-45755 36863 47543 36863
-47983 36863 48765 36863
+45755 36863 48045 36863
+48355 36863 48765 36863
 40855 36919 45045 36919
-45755 36919 47599 36919
-48039 36919 48765 36919
+45755 36919 48045 36919
+48355 36919 48765 36919
 40855 36975 45045 36975
-45755 36975 47655 36975
-48095 36975 48765 36975
+45755 36975 48045 36975
+48355 36975 48765 36975
 40855 37031 45045 37031
-45755 37031 47711 37031
-48151 37031 48765 37031
+45755 37031 48045 37031
+48355 37031 48765 37031
 40855 37087 45038 37087
-45755 37087 47767 37087
-48207 37087 48765 37087
+45755 37087 48045 37087
+48355 37087 48765 37087
 40855 37143 44982 37143
-45755 37143 47823 37143
-48263 37143 48765 37143
+45755 37143 48045 37143
+48355 37143 48765 37143
 40855 37199 44956 37199
-45755 37199 47879 37199
-48316 37199 48765 37199
+45755 37199 48045 37199
+48355 37199 48765 37199
 40855 37255 44935 37255
-45755 37255 47935 37255
-48346 37255 48765 37255
+45755 37255 48045 37255
+48355 37255 48765 37255
 40855 37311 44935 37311
-45755 37311 47991 37311
+45755 37311 48045 37311
 48355 37311 48765 37311
 40855 37367 44941 37367
 45755 37367 48045 37367
diff --git a/wpan-atrf.pro b/wpan-atrf.pro
index 72cefa3..fac6a89 100644
--- a/wpan-atrf.pro
+++ b/wpan-atrf.pro
@@ -1,4 +1,4 @@
-update=Thu Aug 12 22:33:41 2010
+update=Fri Aug 20 17:28:04 2010
 last_client=pcbnew
 [eeschema]
 version=1
diff --git a/wpan-atrf.sch b/wpan-atrf.sch
index 2b5f571..ad2f309 100644
--- a/wpan-atrf.sch
+++ b/wpan-atrf.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu Aug 12 15:15:06 2010
+EESchema Schematic File Version 2  date Fri Aug 20 17:20:36 2010
 LIBS:power
 LIBS:device
 LIBS:conn
@@ -13,7 +13,7 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 1 3
 Title ""
-Date "12 aug 2010"
+Date "20 aug 2010"
 Rev ""
 Comp ""
 Comment1 ""