diff --git a/hardware/kicad/SIMtrace.pro b/hardware/kicad/SIMtrace.pro
index 9e33d84..0d90162 100644
--- a/hardware/kicad/SIMtrace.pro
+++ b/hardware/kicad/SIMtrace.pro
@@ -1,47 +1,7 @@
-update=So 08 Mai 2011 16:42:36 CEST
-last_client=eeschema
+update=Di 10 Mai 2011 17:13:55 CEST
+last_client=cvpcb
 [general]
 version=1
-[cvpcb]
-version=1
-NetIExt=net
-[cvpcb/libraries]
-EquName1=devcms
-[pcbnew]
-version=1
-PadDrlX=320
-PadDimH=600
-PadDimV=600
-BoardThickness=630
-RouteTo=15
-RouteBo=0
-Segm45=1
-Racc45=1
-SgPcb45=1
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-VEgarde=100
-DrawLar=150
-EdgeLar=150
-TxtLar=120
-MSegLar=150
-WpenSer=10
-[pcbnew/libraries]
-LibDir=
-LibName1=sockets
-LibName2=connect
-LibName3=discret
-LibName4=pin_array
-LibName5=divers
-LibName6=libcms
-LibName7=display
-LibName8=valves
-LibName9=led
-LibName10=dip_sockets
-LibName11=lib/SIMtrace
 [eeschema]
 version=1
 LibDir=
@@ -111,3 +71,39 @@ LibName30=valves
 LibName31=lib/at91sam7sxxx-au
 LibName32=lib/SIMtrace
 LibName33=lib/smartcard
+[pcbnew]
+version=1
+PadDrlX=0
+PadDimH=358
+PadDimV=480
+BoardThickness=630
+SgPcb45=1
+TxtPcbV=800
+TxtPcbH=600
+TxtModV=600
+TxtModH=600
+TxtModW=120
+VEgarde=100
+DrawLar=150
+EdgeLar=150
+TxtLar=120
+MSegLar=150
+LastNetListRead=
+[pcbnew/libraries]
+LibName1=sockets
+LibName2=connect
+LibName3=discret
+LibName4=pin_array
+LibName5=divers
+LibName6=libcms
+LibName7=display
+LibName8=valves
+LibName9=led
+LibName10=dip_sockets
+LibName11=lib/SIMtrace
+LibDir=
+[cvpcb]
+version=1
+NetIExt=net
+[cvpcb/libraries]
+EquName1=devcms
diff --git a/hardware/kicad/SIMtrace.sch b/hardware/kicad/SIMtrace.sch
index aacae5d..cf9cc1d 100644
--- a/hardware/kicad/SIMtrace.sch
+++ b/hardware/kicad/SIMtrace.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mo 09 Mai 2011 19:17:29 CEST
+EESchema Schematic File Version 2  date Do 12 Mai 2011 09:33:01 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -38,783 +38,775 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 1 1
 Title "SIMtrace hardware"
-Date "9 may 2011"
-Rev "0.8-"
+Date "12 may 2011"
+Rev "0.9"
 Comp "osmocom"
 Comment1 "CC-BY-SA"
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+Text Label 700  6500 0    60   ~ 0
+USBVCC
 Wire Wire Line
-	9250 4850 8800 4850
+	1850 6500 1850 6800
 Wire Wire Line
-	800  2100 800  2200
+	1050 6800 900  6800
 Wire Wire Line
-	1500 2200 1700 2200
+	900  6800 900  6900
 Wire Wire Line
-	1150 3000 1150 3650
+	500  2200 800  2200
 Wire Wire Line
-	2800 6600 2800 6450
-Connection ~ 750  6850
+	10300 4550 10750 4550
+Connection ~ 1150 3550
 Wire Wire Line
-	650  6950 650  6850
+	1150 3550 900  3550
 Wire Wire Line
-	650  6850 1250 6850
-Connection ~ 950  6850
-Wire Wire Line
-	950  6950 950  6850
-Wire Wire Line
-	7900 1100 8150 1100
-Wire Wire Line
-	8350 1700 8350 1400
-Wire Wire Line
-	7450 1900 8300 1900
-Wire Wire Line
-	1150 650  1600 650 
-Connection ~ 650  900 
-Wire Wire Line
-	750  650  650  650 
-Wire Wire Line
-	650  650  650  1600
-Connection ~ 800  1600
-Wire Wire Line
-	1400 900  650  900 
-Wire Wire Line
-	650  1600 1000 1600
-Connection ~ 1300 1250
-Wire Wire Line
-	1300 1800 1300 1950
-Wire Wire Line
-	1300 1950 1350 1950
-Connection ~ 1850 2800
-Wire Wire Line
-	1850 2800 1850 1950
-Wire Wire Line
-	1150 2700 2450 2700
-Wire Wire Line
-	2950 2900 4700 2900
-Wire Wire Line
-	650  2050 650  2200
-Wire Wire Line
-	1350 3550 1350 3400
-Connection ~ 1350 2900
-Wire Wire Line
-	1150 2900 1550 2900
-Connection ~ 3050 3450
-Wire Wire Line
-	2850 3450 3300 3450
-Connection ~ 3300 2900
-Wire Wire Line
-	3300 3050 3300 2900
-Connection ~ 8950 1950
-Wire Wire Line
-	8950 2050 8950 1950
-Wire Wire Line
-	6850 1000 7000 1000
-Connection ~ 7550 5300
-Wire Wire Line
-	7450 5300 7550 5300
-Connection ~ 9200 3800
-Wire Wire Line
-	9800 4000 9200 4000
-Wire Wire Line
-	9200 4000 9200 3150
-Wire Wire Line
-	9800 3800 9650 3800
-Wire Wire Line
-	9200 3150 9600 3150
-Wire Wire Line
-	7450 3800 9200 3800
-Wire Wire Line
-	4700 2900 4700 3000
-Wire Wire Line
-	3450 7550 3450 7600
-Wire Wire Line
-	5000 7600 5000 7550
-Wire Wire Line
-	4500 7000 5150 7000
-Wire Wire Line
-	4700 7600 4700 7550
-Wire Wire Line
-	3700 7000 3350 7000
-Wire Wire Line
-	10200 5600 8850 5600
-Wire Wire Line
-	9250 5850 9250 5600
-Wire Wire Line
-	7700 6650 7700 6500
-Connection ~ 9650 5600
-Wire Wire Line
-	10550 6550 8700 6550
-Wire Wire Line
-	10550 6350 9500 6350
-Wire Wire Line
-	7450 2900 8350 2900
-Wire Wire Line
-	8750 1950 9350 1950
-Wire Wire Line
-	7000 1250 7650 1250
-Wire Wire Line
-	5050 1100 5050 950 
-Wire Wire Line
-	4750 1000 4750 700 
-Connection ~ 3500 5750
-Wire Wire Line
-	3500 5750 3350 5750
-Connection ~ 3500 6000
-Wire Wire Line
-	3500 6000 4100 6000
-Wire Wire Line
-	4100 6000 4100 5900
-Wire Wire Line
-	4500 5600 4500 5500
-Wire Wire Line
-	4500 5500 5050 5500
-Wire Wire Line
-	3850 5400 3850 5300
-Wire Wire Line
-	3850 5300 5050 5300
-Wire Wire Line
-	4900 5500 4900 5000
-Connection ~ 3200 4900
-Wire Wire Line
-	3200 5000 3200 4850
-Wire Wire Line
-	5050 4900 3200 4900
-Connection ~ 2000 5100
-Wire Wire Line
-	1900 5100 2000 5100
-Wire Wire Line
-	2000 5000 2000 5300
-Wire Wire Line
-	2000 5300 2800 5300
-Wire Wire Line
-	2800 5300 2800 5200
-Wire Wire Line
-	2400 4700 2400 4600
-Wire Wire Line
-	2400 4600 5050 4600
-Wire Wire Line
-	1550 4800 1550 4900
-Wire Wire Line
-	1300 4300 5050 4300
-Connection ~ 950  4100
-Wire Wire Line
-	950  4200 950  4100
-Wire Wire Line
-	10550 1950 10950 1950
-Wire Wire Line
-	9350 1850 8750 1850
-Wire Wire Line
-	7450 3600 7900 3600
-Wire Wire Line
-	7450 3400 7900 3400
-Wire Wire Line
-	10950 1850 10550 1850
-Wire Wire Line
-	10550 1750 10700 1750
-Wire Wire Line
-	10700 1750 10700 1200
-Wire Wire Line
-	2250 6850 2400 6850
-Wire Wire Line
-	2400 6850 2400 6400
-Wire Wire Line
-	2400 6400 2050 6400
-Wire Wire Line
-	950  7350 950  7500
-Wire Wire Line
-	1250 7000 1150 7000
-Wire Wire Line
-	2250 7500 2250 7150
-Wire Wire Line
-	8600 6450 8600 5750
-Wire Wire Line
-	8950 6750 8800 6750
-Connection ~ 7150 6600
-Wire Wire Line
-	7000 6700 7150 6700
-Wire Wire Line
-	7150 6700 7150 6500
-Wire Wire Line
-	7300 6600 7150 6600
-Wire Wire Line
-	6300 6500 6500 6500
-Wire Wire Line
-	10100 6750 10550 6750
-Wire Wire Line
-	10800 5050 10350 5050
-Wire Wire Line
-	8800 5050 9250 5050
-Wire Wire Line
-	8800 4950 9250 4950
-Connection ~ 4900 4500
-Connection ~ 4900 4300
-Connection ~ 4900 5400
-Connection ~ 4900 5100
-Connection ~ 4900 5500
-Wire Wire Line
-	5050 1800 4750 1800
-Connection ~ 1950 3950
-Wire Wire Line
-	1950 3950 1950 3700
-Wire Wire Line
-	1950 3700 2650 3700
-Wire Wire Line
-	3100 3950 4800 3950
-Wire Wire Line
-	4800 3950 4800 3800
-Wire Wire Line
-	4800 3800 5050 3800
-Wire Wire Line
-	4150 1050 4150 700 
-Wire Wire Line
-	4450 650  4450 700 
-Wire Wire Line
-	4150 1550 4150 1900
-Wire Wire Line
-	4450 1600 4450 2100
-Wire Wire Line
-	4200 3100 4700 3100
-Connection ~ 3700 3400
-Wire Wire Line
-	3600 3400 3700 3400
-Wire Wire Line
-	5300 6500 5900 6500
-Wire Wire Line
-	2400 1600 2400 2500
-Wire Wire Line
-	2900 1700 2800 1700
-Wire Wire Line
-	9450 2950 9450 3350
-Wire Wire Line
-	7450 4700 8200 4700
-Connection ~ 8200 4200
-Wire Wire Line
-	8200 4700 8200 4200
-Wire Wire Line
-	7450 3000 7900 3000
-Wire Wire Line
-	7900 3100 7450 3100
-Wire Wire Line
-	7450 2500 8350 2500
-Wire Wire Line
-	10350 4850 10800 4850
-Wire Wire Line
-	9450 2950 9600 2950
-Wire Wire Line
-	9450 2700 9450 2850
-Connection ~ 3900 1900
-Wire Wire Line
-	3800 1900 3900 1900
-Connection ~ 3900 1700
-Wire Wire Line
-	3900 1700 3800 1700
-Connection ~ 3900 1500
-Wire Wire Line
-	3900 1500 3800 1500
-Connection ~ 3900 1300
-Wire Wire Line
-	3900 1300 3800 1300
-Wire Wire Line
-	3900 2000 3900 1100
-Wire Wire Line
-	3900 1100 3800 1100
-Connection ~ 1600 1400
-Wire Wire Line
-	1600 950  1600 1600
-Wire Wire Line
-	1600 1600 1750 1600
-Connection ~ 1600 1200
-Wire Wire Line
-	1600 1300 1750 1300
-Connection ~ 1600 1000
-Wire Wire Line
-	1600 1000 2900 1000
-Wire Wire Line
-	1600 1100 1750 1100
-Connection ~ 2500 1400
-Wire Wire Line
-	2250 1400 2900 1400
-Connection ~ 2700 1200
-Wire Wire Line
-	2250 1200 2900 1200
-Connection ~ 4450 1900
-Wire Wire Line
-	2800 1700 2800 2100
-Wire Wire Line
-	2800 2100 4450 2100
-Connection ~ 2500 1500
-Wire Wire Line
-	2900 1500 2500 1500
-Wire Wire Line
-	2600 1300 2600 2300
-Wire Wire Line
-	2600 2300 5050 2300
-Wire Wire Line
-	5050 2200 2700 2200
-Wire Wire Line
-	5050 2900 4800 2900
-Wire Wire Line
-	3800 3700 3700 3700
-Connection ~ 4450 3700
-Wire Wire Line
-	5050 3300 4700 3300
-Connection ~ 4450 3100
-Connection ~ 4750 5900
-Wire Wire Line
-	4750 5900 5050 5900
-Wire Wire Line
-	4750 6150 4750 5700
-Wire Wire Line
-	4750 5700 5050 5700
-Wire Wire Line
-	5050 5800 4750 5800
-Connection ~ 4750 5800
-Wire Wire Line
-	4750 6000 5050 6000
-Connection ~ 4750 6000
-Wire Wire Line
-	4700 3300 4700 3100
-Wire Wire Line
-	5050 3500 4700 3500
-Wire Wire Line
-	4700 3500 4700 3700
-Wire Wire Line
-	3800 3100 3700 3100
-Wire Wire Line
-	8350 4200 7450 4200
-Wire Wire Line
-	4700 3000 5050 3000
-Wire Wire Line
-	2700 2200 2700 1200
-Wire Wire Line
-	5050 2400 2500 2400
-Wire Wire Line
-	2500 2400 2500 1400
-Wire Wire Line
-	2400 2500 5050 2500
-Wire Wire Line
-	2900 1100 2250 1100
-Wire Wire Line
-	2250 1300 2900 1300
-Connection ~ 2600 1300
-Connection ~ 2400 1600
-Wire Wire Line
-	1600 1200 1750 1200
-Connection ~ 1600 1100
-Wire Wire Line
-	1750 1400 1600 1400
-Connection ~ 1600 1300
-Wire Wire Line
-	3800 1000 3900 1000
-Wire Wire Line
-	3900 1000 3900 850 
-Wire Wire Line
-	3900 850  2800 850 
-Wire Wire Line
-	2800 850  2800 1000
-Connection ~ 2800 1000
-Wire Wire Line
-	3800 1200 3900 1200
-Connection ~ 3900 1200
-Wire Wire Line
-	3900 1400 3800 1400
-Connection ~ 3900 1400
-Wire Wire Line
-	3900 1600 3800 1600
-Connection ~ 3900 1600
-Wire Wire Line
-	3900 1800 3800 1800
-Connection ~ 3900 1800
-Wire Wire Line
-	7450 4400 8350 4400
-Wire Wire Line
-	9450 2850 9600 2850
-Wire Wire Line
-	9450 3350 9600 3350
-Wire Wire Line
-	9600 3050 9300 3050
-Wire Wire Line
-	9300 3050 9300 2800
-Wire Wire Line
-	7450 2000 8200 2000
-Connection ~ 8200 2500
-Wire Wire Line
-	8200 2000 8200 2500
-Wire Wire Line
-	8200 2600 8200 2700
-Wire Wire Line
-	8200 2700 7450 2700
-Connection ~ 8200 2600
-Wire Wire Line
-	8350 4000 7450 4000
-Wire Wire Line
-	7450 2400 8350 2400
-Wire Wire Line
-	7450 2600 8350 2600
-Wire Wire Line
-	7450 2800 8350 2800
-Wire Wire Line
-	7450 4100 8350 4100
-Wire Wire Line
-	7450 4600 8250 4600
-Wire Wire Line
-	8250 4600 8250 4400
-Connection ~ 8250 4400
-Wire Wire Line
-	7450 4300 8350 4300
-Wire Wire Line
-	9300 4550 8800 4550
-Wire Wire Line
-	2900 1600 2250 1600
-Wire Wire Line
-	5300 6700 5900 6700
-Wire Wire Line
-	3700 3100 3700 3700
-Wire Wire Line
-	4700 3700 4200 3700
-Wire Wire Line
-	4750 1800 4750 1600
-Wire Wire Line
-	4450 1000 4450 850 
-Wire Wire Line
-	4150 700  4750 700 
-Connection ~ 4450 700 
-Wire Wire Line
-	2600 3950 2450 3950
-Wire Wire Line
-	3300 3950 3300 3700
-Wire Wire Line
-	3300 3700 3050 3700
-Connection ~ 3300 3950
-Wire Wire Line
-	1850 3950 2050 3950
-Wire Wire Line
-	4150 1900 5050 1900
-Connection ~ 4900 5300
-Connection ~ 4900 4600
-Wire Wire Line
-	6300 6700 6500 6700
-Wire Wire Line
-	7150 6500 7000 6500
-Wire Wire Line
-	9600 6750 9450 6750
-Wire Wire Line
-	9400 6250 9400 5750
-Connection ~ 9250 5600
-Wire Wire Line
-	9000 6350 9000 5750
-Wire Wire Line
-	8200 6550 8200 5750
-Wire Wire Line
-	2550 7400 2550 7500
-Wire Wire Line
-	1250 7400 1250 7150
-Connection ~ 1150 6850
-Wire Wire Line
-	1150 7000 1150 6400
-Wire Wire Line
-	1150 6400 1450 6400
-Connection ~ 2550 7000
-Wire Wire Line
-	9350 2050 9250 2050
-Wire Wire Line
-	9250 2050 9250 2150
-Wire Wire Line
-	7450 3500 7900 3500
-Wire Wire Line
-	7450 3700 7900 3700
-Wire Wire Line
-	9350 1750 8750 1750
-Wire Wire Line
-	10550 2050 10950 2050
-Wire Wire Line
-	750  4100 5050 4100
-Wire Wire Line
-	950  4600 950  4700
-Wire Wire Line
-	1550 4400 1550 4300
-Connection ~ 1550 4300
-Wire Wire Line
-	2050 4400 4900 4400
-Wire Wire Line
-	4900 4400 4900 4700
-Wire Wire Line
-	5050 4500 2000 4500
-Wire Wire Line
-	2000 4500 2000 4600
-Wire Wire Line
-	5050 4700 2800 4700
-Wire Wire Line
-	2800 4700 2800 4800
-Connection ~ 4900 4700
-Wire Wire Line
-	2400 5100 2400 5200
-Wire Wire Line
-	2400 5200 2000 5200
-Connection ~ 2000 5200
-Wire Wire Line
-	4900 5000 3500 5000
-Wire Wire Line
-	5050 5100 3500 5100
-Wire Wire Line
-	3500 5100 3500 5200
-Wire Wire Line
-	5050 5400 4100 5400
-Wire Wire Line
-	4100 5400 4100 5500
-Wire Wire Line
-	4500 6000 4500 6100
-Wire Wire Line
-	4500 6100 3500 6100
-Wire Wire Line
-	3500 6100 3500 5600
-Wire Wire Line
-	3850 5800 3850 5900
-Wire Wire Line
-	3850 5900 3500 5900
-Connection ~ 3500 5900
-Wire Wire Line
-	3200 5400 3200 5500
-Wire Wire Line
-	5050 1700 5050 1500
-Wire Wire Line
-	6200 1250 6400 1250
-Wire Wire Line
-	10950 1350 10700 1350
-Connection ~ 10700 1350
-Wire Wire Line
-	7450 3300 7900 3300
-Wire Wire Line
-	9900 6250 10550 6250
-Wire Wire Line
-	10550 6450 9100 6450
-Wire Wire Line
-	7450 5100 7900 5100
-Wire Wire Line
-	8250 5450 8100 5450
-Wire Wire Line
-	7450 5600 7700 5600
-Wire Wire Line
-	7700 5450 7700 5800
-Connection ~ 7700 5600
-Wire Wire Line
-	8850 5600 8850 5950
-Wire Wire Line
-	9650 5600 9650 5750
-Wire Wire Line
-	8450 6050 8450 5600
-Wire Wire Line
-	3550 7000 3550 7150
-Wire Wire Line
-	3550 7150 3700 7150
-Connection ~ 3550 7000
-Wire Wire Line
-	4100 7600 4100 7400
-Wire Wire Line
-	4700 7150 4500 7150
-Wire Wire Line
-	5000 7150 5000 7000
-Connection ~ 5000 7000
-Wire Wire Line
-	3450 7000 3450 7150
-Connection ~ 3450 7000
-Wire Wire Line
-	9300 3900 9300 3250
-Wire Wire Line
-	9300 3250 9600 3250
-Wire Wire Line
-	7450 3900 9800 3900
-Connection ~ 9300 3900
-Wire Wire Line
-	7450 5400 7550 5400
-Wire Wire Line
-	7550 5400 7550 5200
-Wire Wire Line
-	7450 5200 7650 5200
-Connection ~ 7550 5200
-Wire Wire Line
-	7500 1000 7650 1000
-Wire Wire Line
-	7650 1000 7650 1700
-Connection ~ 7650 1250
-Wire Wire Line
-	8950 2550 8950 2650
-Wire Wire Line
-	4800 2900 4800 2700
-Wire Wire Line
-	3050 3050 3050 2700
-Connection ~ 3050 2700
-Wire Wire Line
-	2450 2900 2450 2800
-Wire Wire Line
-	1550 2900 1550 3600
-Wire Wire Line
-	1150 2600 1700 2600
-Wire Wire Line
-	1700 2600 1700 2200
-Wire Wire Line
-	4800 2700 2950 2700
-Wire Wire Line
-	2450 2800 1150 2800
-Wire Wire Line
-	2100 2550 2100 2700
-Connection ~ 2100 2700
-Wire Wire Line
-	2100 2150 2100 1950
-Wire Wire Line
-	2100 1950 1850 1950
-Wire Wire Line
-	800  1250 800  1600
-Wire Wire Line
-	1300 1100 1300 1400
-Wire Wire Line
-	7650 1700 7450 1700
-Wire Wire Line
-	7450 1800 7750 1800
-Wire Wire Line
-	7750 1800 7750 1700
-Wire Wire Line
-	7750 1700 7850 1700
+	900  3550 900  3700
 Wire Wire Line
 	8550 1100 8900 1100
 Wire Wire Line
-	750  6850 750  6700
+	7850 1700 7750 1700
 Wire Wire Line
-	750  6100 750  5950
+	7750 1700 7750 1800
 Wire Wire Line
-	2250 7000 2800 7000
+	7750 1800 7450 1800
 Wire Wire Line
-	5850 7000 5550 7000
+	7450 1700 7650 1700
 Wire Wire Line
-	900  3700 900  3550
+	1300 1100 1300 1400
 Wire Wire Line
-	900  3550 1150 3550
-Connection ~ 1150 3550
+	800  1250 800  1600
 Wire Wire Line
-	650  2200 800  2200
+	2100 1950 1850 1950
 Wire Wire Line
-	10300 4550 10750 4550
+	2100 1950 2100 2150
+Connection ~ 2100 2700
 Wire Wire Line
-	5700 7150 5700 7000
-Connection ~ 5700 7000
+	2100 2550 2100 2700
+Wire Wire Line
+	1150 2800 2450 2800
+Wire Wire Line
+	2950 2700 4800 2700
+Wire Wire Line
+	1700 2600 1700 2200
+Wire Wire Line
+	1700 2600 1150 2600
+Wire Wire Line
+	1550 3600 1550 2900
+Wire Wire Line
+	2450 2800 2450 2900
+Connection ~ 3050 2700
+Wire Wire Line
+	3050 3050 3050 2700
+Wire Wire Line
+	4800 2700 4800 2900
+Wire Wire Line
+	8950 2550 8950 2650
+Connection ~ 7650 1250
+Wire Wire Line
+	7650 1700 7650 1000
+Wire Wire Line
+	7650 1000 7500 1000
+Connection ~ 7550 5200
+Wire Wire Line
+	7450 5200 7650 5200
+Wire Wire Line
+	7550 5200 7550 5400
+Wire Wire Line
+	7550 5400 7450 5400
+Connection ~ 9300 3900
+Wire Wire Line
+	7450 3900 9800 3900
+Wire Wire Line
+	9600 3250 9300 3250
+Wire Wire Line
+	9300 3250 9300 3900
+Connection ~ 1850 6650
+Connection ~ 3400 6650
+Wire Wire Line
+	3400 6800 3400 6650
+Wire Wire Line
+	3100 6800 2900 6800
+Wire Wire Line
+	2500 7250 2500 7050
+Connection ~ 1950 6650
+Wire Wire Line
+	2100 6800 1950 6800
+Wire Wire Line
+	1950 6800 1950 6650
+Wire Wire Line
+	8450 6050 8450 5600
+Wire Wire Line
+	9650 5600 9650 5750
+Wire Wire Line
+	8850 5950 8850 5600
+Connection ~ 7700 5600
+Wire Wire Line
+	7700 5450 7700 5800
+Wire Wire Line
+	7450 5600 7700 5600
+Wire Wire Line
+	8250 5450 8100 5450
+Wire Wire Line
+	7450 5100 7900 5100
+Wire Wire Line
+	10550 6450 9100 6450
+Wire Wire Line
+	9900 6250 10550 6250
+Wire Wire Line
+	7450 3300 7900 3300
+Connection ~ 10700 1350
+Wire Wire Line
+	10950 1350 10700 1350
+Wire Wire Line
+	6200 1250 6400 1250
+Wire Wire Line
+	5050 1700 5050 1500
+Wire Wire Line
+	3200 5400 3200 5500
+Connection ~ 3500 5900
+Wire Wire Line
+	3500 5900 3850 5900
+Wire Wire Line
+	3850 5900 3850 5800
+Wire Wire Line
+	3500 5600 3500 6100
+Wire Wire Line
+	3500 6100 4500 6100
+Wire Wire Line
+	4500 6100 4500 6000
+Wire Wire Line
+	4100 5500 4100 5400
+Wire Wire Line
+	4100 5400 5050 5400
+Wire Wire Line
+	3500 5200 3500 5100
+Wire Wire Line
+	3500 5100 5050 5100
+Wire Wire Line
+	3500 5000 4900 5000
+Connection ~ 2000 5200
+Wire Wire Line
+	2000 5200 2400 5200
+Wire Wire Line
+	2400 5200 2400 5100
+Connection ~ 4900 4700
+Wire Wire Line
+	2800 4800 2800 4700
+Wire Wire Line
+	2800 4700 5050 4700
+Wire Wire Line
+	2000 4600 2000 4500
+Wire Wire Line
+	2000 4500 5050 4500
+Wire Wire Line
+	4900 4700 4900 4400
+Wire Wire Line
+	4900 4400 2050 4400
+Connection ~ 1550 4300
+Wire Wire Line
+	1550 4400 1550 4300
+Wire Wire Line
+	950  4600 950  4700
+Wire Wire Line
+	750  4100 5050 4100
+Wire Wire Line
+	10550 2050 10950 2050
+Wire Wire Line
+	9350 1750 8750 1750
+Wire Wire Line
+	7450 3700 7900 3700
+Wire Wire Line
+	7450 3500 7900 3500
+Wire Wire Line
+	9250 2150 9250 2050
+Wire Wire Line
+	9250 2050 9350 2050
+Wire Wire Line
+	8200 6550 8200 5750
+Wire Wire Line
+	9000 6350 9000 5750
+Connection ~ 9250 5600
+Wire Wire Line
+	9400 6250 9400 5750
+Wire Wire Line
+	9600 6750 9450 6750
+Wire Wire Line
+	7000 6500 7150 6500
+Wire Wire Line
+	6300 6700 6500 6700
+Connection ~ 4900 4600
+Connection ~ 4900 5300
+Wire Wire Line
+	5050 1900 4150 1900
+Wire Wire Line
+	1850 3950 2050 3950
+Connection ~ 3300 3950
+Wire Wire Line
+	3050 3700 3300 3700
+Wire Wire Line
+	3300 3700 3300 3950
+Wire Wire Line
+	2600 3950 2450 3950
+Connection ~ 4450 700 
+Wire Wire Line
+	4150 700  4750 700 
+Wire Wire Line
+	4450 1000 4450 850 
+Wire Wire Line
+	4750 1600 4750 1800
+Wire Wire Line
+	4200 3700 4700 3700
+Wire Wire Line
+	3700 3100 3700 3700
+Wire Wire Line
+	5300 6700 5900 6700
+Wire Wire Line
+	2900 1600 2250 1600
+Wire Wire Line
+	9300 4550 8800 4550
+Wire Wire Line
+	7450 4300 8350 4300
+Connection ~ 8250 4400
+Wire Wire Line
+	8250 4400 8250 4600
+Wire Wire Line
+	8250 4600 7450 4600
+Wire Wire Line
+	7450 4100 8350 4100
+Wire Wire Line
+	7450 2800 8350 2800
+Wire Wire Line
+	7450 2600 8350 2600
+Wire Wire Line
+	7450 2400 8350 2400
+Wire Wire Line
+	8350 4000 7450 4000
+Connection ~ 8200 2600
+Wire Wire Line
+	7450 2700 8200 2700
+Wire Wire Line
+	8200 2700 8200 2600
+Wire Wire Line
+	8200 2500 8200 2000
+Connection ~ 8200 2500
+Wire Wire Line
+	8200 2000 7450 2000
+Wire Wire Line
+	9300 2800 9300 3050
+Wire Wire Line
+	9300 3050 9600 3050
+Wire Wire Line
+	9600 3350 9450 3350
+Wire Wire Line
+	9600 2850 9450 2850
+Wire Wire Line
+	7450 4400 8350 4400
+Connection ~ 3900 1800
+Wire Wire Line
+	3900 1800 3800 1800
+Connection ~ 3900 1600
+Wire Wire Line
+	3900 1600 3800 1600
+Connection ~ 3900 1400
+Wire Wire Line
+	3900 1400 3800 1400
+Connection ~ 3900 1200
+Wire Wire Line
+	3800 1200 3900 1200
+Connection ~ 2800 1000
+Wire Wire Line
+	2800 1000 2800 850 
+Wire Wire Line
+	2800 850  3900 850 
+Wire Wire Line
+	3900 850  3900 1000
+Wire Wire Line
+	3900 1000 3800 1000
+Connection ~ 1600 1300
+Wire Wire Line
+	1750 1400 1600 1400
+Connection ~ 1600 1100
+Wire Wire Line
+	1600 1200 1750 1200
+Connection ~ 2400 1600
+Connection ~ 2600 1300
+Wire Wire Line
+	2250 1300 2900 1300
+Wire Wire Line
+	2900 1100 2250 1100
+Wire Wire Line
+	5050 2500 2400 2500
+Wire Wire Line
+	2500 1400 2500 2400
+Wire Wire Line
+	2500 2400 5050 2400
+Wire Wire Line
+	2700 1200 2700 2200
+Wire Wire Line
+	5050 3000 4700 3000
+Wire Wire Line
+	8350 4200 7450 4200
+Wire Wire Line
+	3700 3100 3800 3100
+Wire Wire Line
+	4700 3700 4700 3500
+Wire Wire Line
+	4700 3500 5050 3500
+Wire Wire Line
+	4700 3300 4700 3100
+Connection ~ 4750 6000
+Wire Wire Line
+	4750 6000 5050 6000
+Connection ~ 4750 5800
+Wire Wire Line
+	5050 5800 4750 5800
+Wire Wire Line
+	5050 5700 4750 5700
+Wire Wire Line
+	4750 5700 4750 6150
+Wire Wire Line
+	4750 5900 5050 5900
+Connection ~ 4750 5900
+Connection ~ 4450 3100
+Wire Wire Line
+	4700 3300 5050 3300
+Connection ~ 4450 3700
+Wire Wire Line
+	3700 3700 3800 3700
+Wire Wire Line
+	4800 2900 5050 2900
+Wire Wire Line
+	2700 2200 5050 2200
+Wire Wire Line
+	5050 2300 2600 2300
+Wire Wire Line
+	2600 2300 2600 1300
+Wire Wire Line
+	2900 1500 2500 1500
+Connection ~ 2500 1500
+Wire Wire Line
+	2800 2100 4450 2100
+Wire Wire Line
+	2800 2100 2800 1700
+Connection ~ 4450 1900
+Wire Wire Line
+	2250 1200 2900 1200
+Connection ~ 2700 1200
+Wire Wire Line
+	2250 1400 2900 1400
+Connection ~ 2500 1400
+Wire Wire Line
+	1600 1100 1750 1100
+Wire Wire Line
+	1600 1000 2900 1000
+Connection ~ 1600 1000
+Wire Wire Line
+	1600 1300 1750 1300
+Connection ~ 1600 1200
+Wire Wire Line
+	1750 1600 1600 1600
+Wire Wire Line
+	1600 1600 1600 950 
+Connection ~ 1600 1400
+Wire Wire Line
+	3800 1100 3900 1100
+Wire Wire Line
+	3900 1100 3900 2000
+Wire Wire Line
+	3900 1300 3800 1300
+Connection ~ 3900 1300
+Wire Wire Line
+	3900 1500 3800 1500
+Connection ~ 3900 1500
+Wire Wire Line
+	3900 1700 3800 1700
+Connection ~ 3900 1700
+Wire Wire Line
+	3800 1900 3900 1900
+Connection ~ 3900 1900
+Wire Wire Line
+	9450 2850 9450 2700
+Wire Wire Line
+	9600 2950 9450 2950
+Wire Wire Line
+	10350 4850 10800 4850
+Wire Wire Line
+	7450 2500 8350 2500
+Wire Wire Line
+	7900 3100 7450 3100
+Wire Wire Line
+	7450 3000 7900 3000
+Wire Wire Line
+	8200 4200 8200 4700
+Connection ~ 8200 4200
+Wire Wire Line
+	8200 4700 7450 4700
+Wire Wire Line
+	9450 2950 9450 3350
+Wire Wire Line
+	2800 1700 2900 1700
+Wire Wire Line
+	2400 2500 2400 1600
+Wire Wire Line
+	5300 6500 5900 6500
+Wire Wire Line
+	3600 3400 3700 3400
+Connection ~ 3700 3400
+Wire Wire Line
+	4700 3100 4200 3100
+Wire Wire Line
+	4450 2100 4450 1600
+Wire Wire Line
+	4150 1900 4150 1550
+Wire Wire Line
+	4450 650  4450 700 
+Wire Wire Line
+	4150 700  4150 1050
+Wire Wire Line
+	5050 3800 4800 3800
+Wire Wire Line
+	4800 3800 4800 3950
+Wire Wire Line
+	4800 3950 3100 3950
+Wire Wire Line
+	2650 3700 1950 3700
+Wire Wire Line
+	1950 3700 1950 3950
+Connection ~ 1950 3950
+Wire Wire Line
+	4750 1800 5050 1800
+Connection ~ 4900 5500
+Connection ~ 4900 5100
+Connection ~ 4900 5400
+Connection ~ 4900 4300
+Connection ~ 4900 4500
+Wire Wire Line
+	8800 4950 9250 4950
+Wire Wire Line
+	8800 5050 9250 5050
+Wire Wire Line
+	10800 5050 10350 5050
+Wire Wire Line
+	10100 6750 10550 6750
+Wire Wire Line
+	6300 6500 6500 6500
+Wire Wire Line
+	7300 6600 7150 6600
+Wire Wire Line
+	7150 6500 7150 6700
+Wire Wire Line
+	7150 6700 7000 6700
+Connection ~ 7150 6600
+Wire Wire Line
+	8950 6750 8800 6750
+Wire Wire Line
+	8600 6450 8600 5750
+Wire Wire Line
+	10700 1200 10700 1750
+Wire Wire Line
+	10700 1750 10550 1750
+Wire Wire Line
+	10950 1850 10550 1850
+Wire Wire Line
+	7450 3400 7900 3400
+Wire Wire Line
+	7450 3600 7900 3600
+Wire Wire Line
+	9350 1850 8750 1850
+Wire Wire Line
+	10550 1950 10950 1950
+Wire Wire Line
+	950  4200 950  4100
+Connection ~ 950  4100
+Wire Wire Line
+	1300 4300 5050 4300
+Wire Wire Line
+	1550 4800 1550 4900
+Wire Wire Line
+	5050 4600 2400 4600
+Wire Wire Line
+	2400 4600 2400 4700
+Wire Wire Line
+	2800 5200 2800 5300
+Wire Wire Line
+	2800 5300 2000 5300
+Wire Wire Line
+	2000 5300 2000 5000
+Wire Wire Line
+	1900 5100 2000 5100
+Connection ~ 2000 5100
+Wire Wire Line
+	5050 4900 3200 4900
+Wire Wire Line
+	3200 5000 3200 4850
+Connection ~ 3200 4900
+Wire Wire Line
+	4900 5000 4900 5500
+Wire Wire Line
+	5050 5300 3850 5300
+Wire Wire Line
+	3850 5300 3850 5400
+Wire Wire Line
+	5050 5500 4500 5500
+Wire Wire Line
+	4500 5500 4500 5600
+Wire Wire Line
+	4100 5900 4100 6000
+Wire Wire Line
+	4100 6000 3500 6000
+Connection ~ 3500 6000
+Wire Wire Line
+	3500 5750 3350 5750
+Connection ~ 3500 5750
+Wire Wire Line
+	4750 700  4750 1000
+Wire Wire Line
+	5050 1100 5050 950 
+Wire Wire Line
+	7000 1250 7650 1250
+Wire Wire Line
+	8750 1950 9350 1950
+Wire Wire Line
+	7450 2900 8350 2900
+Wire Wire Line
+	10550 6350 9500 6350
+Wire Wire Line
+	10550 6550 8700 6550
+Connection ~ 9650 5600
+Wire Wire Line
+	7700 6650 7700 6500
+Wire Wire Line
+	9250 5850 9250 5600
+Wire Wire Line
+	8850 5600 10200 5600
+Wire Wire Line
+	3100 7250 3100 7200
+Wire Wire Line
+	2900 6650 3550 6650
+Wire Wire Line
+	3400 7250 3400 7200
+Wire Wire Line
+	1850 7200 1850 7250
+Wire Wire Line
+	4700 3000 4700 2900
+Wire Wire Line
+	7450 3800 9200 3800
+Wire Wire Line
+	9600 3150 9200 3150
+Wire Wire Line
+	9800 3800 9650 3800
+Wire Wire Line
+	9200 3150 9200 4000
+Wire Wire Line
+	9200 4000 9800 4000
+Connection ~ 9200 3800
+Wire Wire Line
+	7450 5300 7550 5300
+Connection ~ 7550 5300
+Wire Wire Line
+	6850 1000 7000 1000
+Wire Wire Line
+	8950 2050 8950 1950
+Connection ~ 8950 1950
+Wire Wire Line
+	3300 3050 3300 2900
+Connection ~ 3300 2900
+Wire Wire Line
+	2850 3450 3300 3450
+Connection ~ 3050 3450
+Wire Wire Line
+	1550 2900 1150 2900
+Connection ~ 1350 2900
+Wire Wire Line
+	1350 3550 1350 3400
+Wire Wire Line
+	4700 2900 2950 2900
+Wire Wire Line
+	1150 2700 2450 2700
+Wire Wire Line
+	1850 1950 1850 2800
+Connection ~ 1850 2800
+Wire Wire Line
+	1350 1950 1300 1950
+Wire Wire Line
+	1300 1950 1300 1800
+Connection ~ 1300 1250
+Wire Wire Line
+	1000 1600 650  1600
+Wire Wire Line
+	1400 900  650  900 
+Connection ~ 800  1600
+Wire Wire Line
+	650  1600 650  650 
+Wire Wire Line
+	650  650  750  650 
+Connection ~ 650  900 
+Wire Wire Line
+	1150 650  1600 650 
+Wire Wire Line
+	7450 1900 8300 1900
+Wire Wire Line
+	8350 1700 8350 1400
+Wire Wire Line
+	7900 1100 8150 1100
+Wire Wire Line
+	1150 3000 1150 3650
+Wire Wire Line
+	1700 2200 1500 2200
+Wire Wire Line
+	9250 4850 8800 4850
+Wire Wire Line
+	1050 6500 650  6500
+Wire Wire Line
+	1450 6500 1600 6500
+Wire Wire Line
+	1600 6650 2100 6650
+Wire Wire Line
+	1450 6800 1600 6800
+Wire Wire Line
+	1600 6800 1600 6500
+Connection ~ 1600 6650
 $Comp
-L PWR_FLAG #FLG02
-U 1 1 4DC82183
-P 5700 7150
-F 0 "#FLG02" H 5700 7420 30  0001 C CNN
-F 1 "PWR_FLAG" H 5700 7380 30  0000 C CNN
-	1    5700 7150
-	-1   0    0    1   
+L ZENER D6
+U 1 1 4DCB8C13
+P 1250 6500
+F 0 "D6" H 1250 6600 50  0000 C CNN
+F 1 "1N5819" H 1250 6400 40  0000 C CNN
+	1    1250 6500
+	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR03
+L ZENER D7
+U 1 1 4DCB8C0D
+P 1250 6800
+F 0 "D7" H 1250 6900 50  0000 C CNN
+F 1 "1N5819" H 1250 6700 40  0000 C CNN
+	1    1250 6800
+	1    0    0    -1  
+$EndComp
+Text Label 500  2200 0    60   ~ 0
+USBVCC
+$Comp
+L ISO7816_NO P4
+U 1 1 4DC8FA06
+P 9800 5000
+F 0 "P4" H 9800 5250 60  0000 C CNN
+F 1 "SIM" H 9800 4750 60  0000 C CNN
+	1    9800 5000
+	1    0    0    -1  
+$EndComp
+$Comp
+L ISO7816_NO P4
+U 2 1 4DC8F9F0
+P 9800 4550
+F 0 "P4" H 9800 4700 60  0000 C CNN
+F 1 "SIM" H 9800 4450 60  0000 C CNN
+	2    9800 4550
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C12
+U 1 1 4DC8F97A
+P 3200 5200
+F 0 "C12" H 3250 5300 50  0000 L CNN
+F 1 "2.2uF" H 3250 5100 50  0000 L CNN
+F 2 "SM0603" H 3200 5200 60  0001 C CNN
+	1    3200 5200
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C1
+U 1 1 4DC8F975
+P 950 4400
+F 0 "C1" H 1000 4500 50  0000 L CNN
+F 1 "2.2uF" H 1000 4300 50  0000 L CNN
+F 2 "SM0603" H 950 4400 60  0001 C CNN
+	1    950  4400
+	1    0    0    -1  
+$EndComp
+$Comp
+L 3V3 #PWR01
 U 1 1 4DC820B7
 P 9600 6750
-F 0 "#PWR03" H 9600 6850 40  0001 C CNN
+F 0 "#PWR01" H 9600 6850 40  0001 C CNN
 F 1 "3V3" H 9600 6875 40  0000 C CNN
 	1    9600 6750
 	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR04
+L 3V3 #PWR02
 U 1 1 4DC815E7
 P 7700 6650
-F 0 "#PWR04" H 7700 6750 40  0001 C CNN
+F 0 "#PWR02" H 7700 6750 40  0001 C CNN
 F 1 "3V3" H 7700 6775 40  0000 C CNN
 	1    7700 6650
 	-1   0    0    1   
 $EndComp
 $Comp
-L 3V3 #PWR05
+L 3V3 #PWR03
 U 1 1 4DC80D76
 P 10750 4550
-F 0 "#PWR05" H 10750 4650 40  0001 C CNN
+F 0 "#PWR03" H 10750 4650 40  0001 C CNN
 F 1 "3V3" H 10750 4675 40  0000 C CNN
 	1    10750 4550
 	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR06
+L 3V3 #PWR04
 U 1 1 4DC80D4F
 P 7300 6600
-F 0 "#PWR06" H 7300 6700 40  0001 C CNN
+F 0 "#PWR04" H 7300 6700 40  0001 C CNN
 F 1 "3V3" H 7300 6725 40  0000 C CNN
 	1    7300 6600
 	0    1    1    0   
 $EndComp
 $Comp
-L PWR_FLAG #FLG07
-U 1 1 4DC8070F
-P 800 2100
-F 0 "#FLG07" H 800 2370 30  0001 C CNN
-F 1 "PWR_FLAG" H 800 2330 30  0000 C CNN
-	1    800  2100
-	1    0    0    -1  
-$EndComp
-$Comp
-L PWR_FLAG #FLG08
+L PWR_FLAG #FLG05
 U 1 1 4DC80677
 P 900 3700
-F 0 "#FLG08" H 900 3970 30  0001 C CNN
+F 0 "#FLG05" H 900 3970 30  0001 C CNN
 F 1 "PWR_FLAG" H 900 3930 30  0000 C CNN
 	1    900  3700
 	-1   0    0    1   
 $EndComp
 $Comp
-L DIODE D5
-U 1 1 4DC80636
-P 5350 7000
-F 0 "D5" H 5350 7100 40  0000 C CNN
-F 1 "1N4148" H 5350 6900 40  0000 C CNN
-	1    5350 7000
+L GND #PWR06
+U 1 1 4DC804F4
+P 900 7500
+F 0 "#PWR06" H 900 7500 30  0001 C CNN
+F 1 "GND" H 900 7430 30  0001 C CNN
+	1    900  7500
 	1    0    0    -1  
 $EndComp
 $Comp
-L DIODE D4
-U 1 1 4DC8060C
-P 2800 6800
-F 0 "D4" H 2800 6900 40  0000 C CNN
-F 1 "1N4148" H 2800 6700 40  0000 C CNN
-	1    2800 6800
-	0    -1   -1   0   
-$EndComp
-$Comp
-L GND #PWR09
-U 1 1 4DC804F4
-P 750 5950
-F 0 "#PWR09" H 750 5950 30  0001 C CNN
-F 1 "GND" H 750 5880 30  0001 C CNN
-	1    750  5950
-	-1   0    0    1   
-$EndComp
-$Comp
-L PWR_FLAG #FLG010
+L PWR_FLAG #FLG07
 U 1 1 4DC804C2
-P 650 6950
-F 0 "#FLG010" H 650 7220 30  0001 C CNN
-F 1 "PWR_FLAG" H 650 7180 30  0000 C CNN
-	1    650  6950
-	-1   0    0    1   
+P 1850 6500
+F 0 "#FLG07" H 1850 6770 30  0001 C CNN
+F 1 "PWR_FLAG" H 1850 6730 30  0000 C CNN
+	1    1850 6500
+	1    0    0    -1  
 $EndComp
 $Comp
 L BATTERY BT1
 U 1 1 4DC804A6
-P 750 6400
-F 0 "BT1" H 750 6600 50  0000 C CNN
-F 1 "BATTERY" H 750 6210 50  0000 C CNN
-	1    750  6400
-	0    -1   -1   0   
+P 900 7200
+F 0 "BT1" H 900 7400 50  0000 C CNN
+F 1 "BATTERY" H 900 6900 50  0000 C CNN
+F 2 "PIN_ARRAY_2X1" H 900 7200 60  0001 C CNN
+F 4 ">4V" H 900 7000 50  0000 C CNN "Field1"
+	1    900  7200
+	0    1    1    0   
 $EndComp
 $Comp
-L 3V3 #PWR011
+L 3V3 #PWR08
 U 1 1 4DC80254
-P 5850 7000
-F 0 "#PWR011" H 5850 7100 40  0001 C CNN
-F 1 "3V3" H 5850 7125 40  0000 C CNN
-	1    5850 7000
+P 3550 6650
+F 0 "#PWR08" H 3550 6750 40  0001 C CNN
+F 1 "3V3" H 3550 6775 40  0000 C CNN
+	1    3550 6650
 	0    1    1    0   
 $EndComp
 NoConn ~ 7450 3200
@@ -836,15 +828,17 @@ U 1 1 4DC7A43A
 P 8350 1200
 F 0 "Q2" H 8350 1050 50  0000 R CNN
 F 1 "BC487" V 8750 1200 50  0000 R CNN
-F 4 "45V,100mA" V 8600 1200 50  0000 C CNN "Field1"
+F 2 "SO14E" H 8350 1200 60  0001 C CNN
+F 4 "45V" V 8600 1100 50  0000 C CNN "Field1"
+F 5 "100mA" V 8600 1350 50  0000 C CNN "Field2"
 	1    8350 1200
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR09
 U 1 1 4DC7A434
 P 7900 1100
-F 0 "#PWR012" H 7900 1100 30  0001 C CNN
+F 0 "#PWR09" H 7900 1100 30  0001 C CNN
 F 1 "GND" H 7900 1030 30  0001 C CNN
 	1    7900 1100
 	0    1    1    0   
@@ -861,15 +855,17 @@ U 1 1 4DC7A27C
 P 950 650
 F 0 "D1" H 950 750 50  0000 C CNN
 F 1 "Schottky" H 950 550 40  0000 C CNN
-F 4 "45V,100m" H 1300 550 50  0000 C CNN "Field1"
+F 2 "SOT23EBC" H 950 650 60  0001 C CNN
+F 4 "30V" H 1200 550 50  0000 C CNN "Field1"
+F 5 "500mA" H 1450 550 50  0000 C CNN "Field2"
 	1    950  650 
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR013
+L 3V3 #PWR010
 U 1 1 4DC7A233
 P 1300 1100
-F 0 "#PWR013" H 1300 1200 40  0001 C CNN
+F 0 "#PWR010" H 1300 1200 40  0001 C CNN
 F 1 "3V3" H 1300 1225 40  0000 C CNN
 	1    1300 1100
 	1    0    0    -1  
@@ -880,15 +876,17 @@ U 1 1 4DC7A1CA
 P 1200 1600
 F 0 "Q1" H 1200 1450 50  0000 R CNN
 F 1 "BC847" H 1050 1500 50  0000 R CNN
-F 4 "45V,100mA" H 850 1400 50  0000 C CNN "Field1"
+F 2 "SO14E" H 1200 1600 60  0001 C CNN
+F 4 "45V" H 750 1400 50  0000 C CNN "Field1"
+F 5 "100mA" H 950 1400 50  0000 C CNN "Field2"
 	1    1200 1600
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR014
+L 3V3 #PWR011
 U 1 1 4DC79FE6
 P 1350 3550
-F 0 "#PWR014" H 1350 3650 40  0001 C CNN
+F 0 "#PWR011" H 1350 3650 40  0001 C CNN
 F 1 "3V3" H 1350 3675 40  0000 C CNN
 	1    1350 3550
 	-1   0    0    1   
@@ -896,10 +894,10 @@ $EndComp
 Text Label 1550 3500 1    60   ~ 0
 A-B-DETECT
 $Comp
-L GND #PWR015
+L GND #PWR012
 U 1 1 4DC79F9B
 P 2850 3450
-F 0 "#PWR015" H 2850 3450 30  0001 C CNN
+F 0 "#PWR012" H 2850 3450 30  0001 C CNN
 F 1 "GND" H 2850 3380 30  0001 C CNN
 	1    2850 3450
 	0    1    1    0   
@@ -910,6 +908,7 @@ U 1 1 4DC79EDF
 P 2100 2350
 F 0 "C5" H 2150 2450 50  0000 L CNN
 F 1 "33pF" H 2150 2250 50  0000 L CNN
+F 2 "SM0603" H 2100 2350 60  0001 C CNN
 	1    2100 2350
 	-1   0    0    1   
 $EndComp
@@ -919,6 +918,7 @@ U 1 1 4DC79EDC
 P 3300 3250
 F 0 "C13" H 3350 3350 50  0000 L CNN
 F 1 "15pF" H 3350 3150 50  0000 L CNN
+F 2 "SM0603" H 3300 3250 60  0001 C CNN
 	1    3300 3250
 	1    0    0    -1  
 $EndComp
@@ -928,6 +928,7 @@ U 1 1 4DC79ED8
 P 3050 3250
 F 0 "C11" H 3100 3350 50  0000 L CNN
 F 1 "15pF" H 3100 3150 50  0000 L CNN
+F 2 "SM0603" H 3050 3250 60  0001 C CNN
 	1    3050 3250
 	1    0    0    -1  
 $EndComp
@@ -937,6 +938,7 @@ U 1 1 4DC79ED1
 P 1050 1250
 F 0 "R1" V 1130 1250 50  0000 C CNN
 F 1 "100K" V 1050 1250 50  0000 C CNN
+F 2 "SM0603" H 1050 1250 60  0001 C CNN
 	1    1050 1250
 	0    1    1    0   
 $EndComp
@@ -973,6 +975,7 @@ U 1 1 4DC79E9A
 P 1350 3150
 F 0 "R2" V 1430 3150 50  0000 C CNN
 F 1 "10K" V 1350 3150 50  0000 C CNN
+F 2 "SM0603" H 1350 3150 60  0001 C CNN
 	1    1350 3150
 	1    0    0    -1  
 $EndComp
@@ -982,6 +985,7 @@ U 1 1 4CFAC6EA
 P 750 2800
 F 0 "J1" H 800 3250 50  0000 L BNN
 F 1 "USB-B_MINI" H 650 2350 50  0000 L BNN
+F 2 "con-usb-USB-MB-S" H 750 2800 60  0001 C CNN
 	1    750  2800
 	1    0    0    -1  
 $EndComp
@@ -991,14 +995,17 @@ U 1 1 4DC79E48
 P 1150 2200
 F 0 "FB1" H 1150 2350 60  0000 C CNN
 F 1 "FILTER" H 1150 2100 60  0000 C CNN
+F 4 "100Mhz" H 750 2250 50  0000 C CNN "Field1"
+F 5 "1A" H 950 2350 50  0000 C CNN "Field2"
+F 6 "39Ohm" H 750 2350 50  0000 C CNN "Field3"
 	1    1150 2200
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR013
 U 1 1 4DC799FC
 P 8950 2650
-F 0 "#PWR016" H 8950 2650 30  0001 C CNN
+F 0 "#PWR013" H 8950 2650 30  0001 C CNN
 F 1 "GND" H 8950 2580 30  0001 C CNN
 	1    8950 2650
 	1    0    0    -1  
@@ -1013,28 +1020,28 @@ F 1 "10k" V 8950 2300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR014
 U 1 1 4DC790F9
 P 6850 1000
-F 0 "#PWR017" H 6850 1000 30  0001 C CNN
+F 0 "#PWR014" H 6850 1000 30  0001 C CNN
 F 1 "GND" H 6850 930 30  0001 C CNN
 	1    6850 1000
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR015
 U 1 1 4DC790AF
 P 7650 5200
-F 0 "#PWR018" H 7650 5200 30  0001 C CNN
+F 0 "#PWR015" H 7650 5200 30  0001 C CNN
 F 1 "GND" H 7650 5130 30  0001 C CNN
 	1    7650 5200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR019
+L GND #PWR016
 U 1 1 4DC6ABFD
 P 9650 3800
-F 0 "#PWR019" H 9650 3800 30  0001 C CNN
+F 0 "#PWR016" H 9650 3800 30  0001 C CNN
 F 1 "GND" H 9650 3730 30  0001 C CNN
 	1    9650 3800
 	0    1    1    0   
@@ -1049,84 +1056,88 @@ F 1 "JACK" H 10050 3700 50  0000 L BNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR017
 U 1 1 4DC6A8EB
 P 1150 3650
-F 0 "#PWR020" H 1150 3650 30  0001 C CNN
+F 0 "#PWR017" H 1150 3650 30  0001 C CNN
 F 1 "GND" H 1150 3580 30  0001 C CNN
 	1    1150 3650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR018
 U 1 1 4DC6A5F7
-P 3450 7600
-F 0 "#PWR021" H 3450 7600 30  0001 C CNN
-F 1 "GND" H 3450 7530 30  0001 C CNN
-	1    3450 7600
+P 1850 7250
+F 0 "#PWR018" H 1850 7250 30  0001 C CNN
+F 1 "GND" H 1850 7180 30  0001 C CNN
+	1    1850 7250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR019
 U 1 1 4DC6A5F4
-P 5000 7600
-F 0 "#PWR022" H 5000 7600 30  0001 C CNN
-F 1 "GND" H 5000 7530 30  0001 C CNN
-	1    5000 7600
+P 3400 7250
+F 0 "#PWR019" H 3400 7250 30  0001 C CNN
+F 1 "GND" H 3400 7180 30  0001 C CNN
+	1    3400 7250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR020
 U 1 1 4DC6A5F0
-P 4700 7600
-F 0 "#PWR023" H 4700 7600 30  0001 C CNN
-F 1 "GND" H 4700 7530 30  0001 C CNN
-	1    4700 7600
+P 3100 7250
+F 0 "#PWR020" H 3100 7250 30  0001 C CNN
+F 1 "GND" H 3100 7180 30  0001 C CNN
+	1    3100 7250
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C14
 U 1 1 4DC6A5DE
-P 3450 7350
-F 0 "C14" H 3500 7450 50  0000 L CNN
-F 1 "1uF" H 3500 7250 50  0000 L CNN
-	1    3450 7350
+P 1850 7000
+F 0 "C14" H 1900 7100 50  0000 L CNN
+F 1 "1uF" H 1900 6900 50  0000 L CNN
+F 2 "SM0603" H 1850 7000 60  0001 C CNN
+	1    1850 7000
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C22
 U 1 1 4DC6A5D9
-P 5000 7350
-F 0 "C22" H 5050 7450 50  0000 L CNN
-F 1 "1uF" H 5050 7250 50  0000 L CNN
-	1    5000 7350
+P 3400 7000
+F 0 "C22" H 3450 7100 50  0000 L CNN
+F 1 "1uF" H 3450 6900 50  0000 L CNN
+F 2 "SM0603" H 3400 7000 60  0001 C CNN
+	1    3400 7000
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C21
 U 1 1 4DC6A5CB
-P 4700 7350
-F 0 "C21" H 4750 7450 50  0000 L CNN
-F 1 "10nF" H 4750 7250 50  0000 L CNN
-	1    4700 7350
+P 3100 7000
+F 0 "C21" H 3150 7100 50  0000 L CNN
+F 1 "10nF" H 3150 6900 50  0000 L CNN
+F 2 "SM0603" H 3100 7000 60  0001 C CNN
+	1    3100 7000
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR021
 U 1 1 4DC6A577
-P 4100 7600
-F 0 "#PWR024" H 4100 7600 30  0001 C CNN
-F 1 "GND" H 4100 7530 30  0001 C CNN
-	1    4100 7600
+P 2500 7250
+F 0 "#PWR021" H 2500 7250 30  0001 C CNN
+F 1 "GND" H 2500 7180 30  0001 C CNN
+	1    2500 7250
 	1    0    0    -1  
 $EndComp
 $Comp
 L TPS736XX IC2
 U 1 1 4DC6A52E
-P 4100 7200
-F 0 "IC2" H 4100 7650 60  0000 C CNN
-F 1 "TPS73633" H 4100 7550 60  0000 C CNN
-	1    4100 7200
+P 2500 6850
+F 0 "IC2" H 2500 7300 60  0000 C CNN
+F 1 "TPS73633" H 2500 7200 60  0000 C CNN
+F 2 "SOT223" H 2500 6850 60  0001 C CNN
+	1    2500 6850
 	1    0    0    -1  
 $EndComp
 Text Label 8450 5950 1    60   ~ 0
@@ -1182,14 +1193,15 @@ U 1 1 4DC68E45
 P 7900 5450
 F 0 "C23" H 7950 5550 50  0000 L CNN
 F 1 "100nF" H 7950 5350 50  0000 L CNN
+F 2 "SM0603" H 7900 5450 60  0001 C CNN
 	1    7900 5450
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR022
 U 1 1 4DC68E36
 P 8250 5450
-F 0 "#PWR025" H 8250 5450 30  0001 C CNN
+F 0 "#PWR022" H 8250 5450 30  0001 C CNN
 F 1 "GND" H 8250 5380 30  0001 C CNN
 	1    8250 5450
 	0    -1   -1   0   
@@ -1216,10 +1228,10 @@ WP
 Text Label 7650 1100 3    60   ~ 0
 BOOTLOADER
 $Comp
-L 3V3 #PWR026
+L 3V3 #PWR023
 U 1 1 4DC6854C
 P 6200 1250
-F 0 "#PWR026" H 6200 1350 40  0001 C CNN
+F 0 "#PWR023" H 6200 1350 40  0001 C CNN
 F 1 "3V3" H 6200 1375 40  0000 C CNN
 	1    6200 1250
 	0    -1   -1   0   
@@ -1243,19 +1255,19 @@ F 1 "BOOTLOADER" H 6700 1170 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR027
+L 3V3 #PWR024
 U 1 1 4DC68405
 P 4450 650
-F 0 "#PWR027" H 4450 750 40  0001 C CNN
+F 0 "#PWR024" H 4450 750 40  0001 C CNN
 F 1 "3V3" H 4450 775 40  0000 C CNN
 	1    4450 650 
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR028
+L 3V3 #PWR025
 U 1 1 4DC683FB
 P 5050 950
-F 0 "#PWR028" H 5050 1050 40  0001 C CNN
+F 0 "#PWR025" H 5050 1050 40  0001 C CNN
 F 1 "3V3" H 5050 1075 40  0000 C CNN
 	1    5050 950 
 	1    0    0    -1  
@@ -1279,28 +1291,28 @@ F 1 "TEST" H 4750 1220 40  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR026
 U 1 1 4DC665D5
 P 3350 5750
-F 0 "#PWR029" H 3350 5750 30  0001 C CNN
+F 0 "#PWR026" H 3350 5750 30  0001 C CNN
 F 1 "GND" H 3350 5680 30  0001 C CNN
 	1    3350 5750
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR027
 U 1 1 4DC665D1
 P 3200 5500
-F 0 "#PWR030" H 3200 5500 30  0001 C CNN
+F 0 "#PWR027" H 3200 5500 30  0001 C CNN
 F 1 "GND" H 3200 5430 30  0001 C CNN
 	1    3200 5500
 	1    0    0    -1  
 $EndComp
 $Comp
-L 1V8 #PWR031
+L 1V8 #PWR028
 U 1 1 4DC6650D
 P 3500 5000
-F 0 "#PWR031" H 3500 5140 20  0001 C CNN
+F 0 "#PWR028" H 3500 5140 20  0001 C CNN
 F 1 "1V8" H 3500 5110 30  0000 C CNN
 	1    3500 5000
 	0    -1   -1   0   
@@ -1311,6 +1323,7 @@ U 1 1 4DC664E0
 P 4100 5700
 F 0 "C19" H 4150 5800 50  0000 L CNN
 F 1 "100nF" H 4150 5600 50  0000 L CNN
+F 2 "SM0603" H 4100 5700 60  0001 C CNN
 	1    4100 5700
 	1    0    0    -1  
 $EndComp
@@ -1320,54 +1333,38 @@ U 1 1 4DC664DD
 P 3850 5600
 F 0 "C16" H 3900 5700 50  0000 L CNN
 F 1 "100nF" H 3900 5500 50  0000 L CNN
+F 2 "SM0603" H 3850 5600 60  0001 C CNN
 	1    3850 5600
 	-1   0    0    -1  
 $EndComp
 $Comp
-L CP C12
-U 1 1 4DC664CD
-P 3200 5200
-F 0 "C12" H 3250 5300 50  0000 L CNN
-F 1 "10uF" H 3250 5100 50  0000 L CNN
-	1    3200 5200
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C4
 U 1 1 4DC66392
 P 2000 4800
 F 0 "C4" H 2050 4900 50  0000 L CNN
 F 1 "100nF" H 2050 4700 50  0000 L CNN
+F 2 "SM0603" H 2000 4800 60  0001 C CNN
 	1    2000 4800
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR032
+L 3V3 #PWR029
 U 1 1 4DC662E1
 P 1300 4300
-F 0 "#PWR032" H 1300 4400 40  0001 C CNN
+F 0 "#PWR029" H 1300 4400 40  0001 C CNN
 F 1 "3V3" H 1300 4425 40  0000 C CNN
 	1    1300 4300
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR033
+L GND #PWR030
 U 1 1 4DC66159
 P 950 4700
-F 0 "#PWR033" H 950 4700 30  0001 C CNN
+F 0 "#PWR030" H 950 4700 30  0001 C CNN
 F 1 "GND" H 950 4630 30  0001 C CNN
 	1    950  4700
 	1    0    0    -1  
 $EndComp
-$Comp
-L CP C1
-U 1 1 4DC6613D
-P 950 4400
-F 0 "C1" H 1000 4500 50  0000 L CNN
-F 1 "10uF" H 1000 4300 50  0000 L CNN
-	1    950  4400
-	-1   0    0    1   
-$EndComp
 Text Label 10700 2050 0    60   ~ 0
 MOSI
 Text Label 10700 1950 0    60   ~ 0
@@ -1385,10 +1382,10 @@ MOSI
 Text Label 7600 3400 0    60   ~ 0
 SCK
 $Comp
-L GND #PWR034
+L GND #PWR031
 U 1 1 4DC5A389
 P 9250 2150
-F 0 "#PWR034" H 9250 2150 30  0001 C CNN
+F 0 "#PWR031" H 9250 2150 30  0001 C CNN
 F 1 "GND" H 9250 2080 30  0001 C CNN
 	1    9250 2150
 	1    0    0    -1  
@@ -1403,10 +1400,10 @@ F 1 "10k" V 10950 1600 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L 3V3 #PWR035
+L 3V3 #PWR032
 U 1 1 4DC5A300
 P 10700 1200
-F 0 "#PWR035" H 10700 1300 40  0001 C CNN
+F 0 "#PWR032" H 10700 1300 40  0001 C CNN
 F 1 "3V3" H 10700 1325 40  0000 C CNN
 	1    10700 1200
 	1    0    0    -1  
@@ -1422,89 +1419,6 @@ F 1 "FLASH_SPI" H 9950 1600 60  0000 C CNN
 	1    9950 1900
 	1    0    0    -1  
 $EndComp
-Text Notes 1350 6250 0    100  ~ 20
-BATT-POWER
-$Comp
-L 3V3 #PWR036
-U 1 1 4DC58DC4
-P 2800 6450
-F 0 "#PWR036" H 2800 6550 40  0001 C CNN
-F 1 "3V3" H 2800 6575 40  0000 C CNN
-	1    2800 6450
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR037
-U 1 1 4DC58D93
-P 2250 7500
-F 0 "#PWR037" H 2250 7500 30  0001 C CNN
-F 1 "GND" H 2250 7430 30  0001 C CNN
-	1    2250 7500
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR038
-U 1 1 4DC58D8B
-P 2550 7500
-F 0 "#PWR038" H 2550 7500 30  0001 C CNN
-F 1 "GND" H 2550 7430 30  0001 C CNN
-	1    2550 7500
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR039
-U 1 1 4DC58D84
-P 950 7500
-F 0 "#PWR039" H 950 7500 30  0001 C CNN
-F 1 "GND" H 950 7430 30  0001 C CNN
-	1    950  7500
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR040
-U 1 1 4DC58D7E
-P 1250 7400
-F 0 "#PWR040" H 1250 7400 30  0001 C CNN
-F 1 "GND" H 1250 7330 30  0001 C CNN
-	1    1250 7400
-	1    0    0    -1  
-$EndComp
-$Comp
-L INDUCTOR L1
-U 1 1 4DC58D6B
-P 1750 6400
-F 0 "L1" V 1700 6400 40  0000 C CNN
-F 1 "4.7uH" V 1850 6400 40  0000 C CNN
-	1    1750 6400
-	0    1    1    0   
-$EndComp
-$Comp
-L C C8
-U 1 1 4DC58D42
-P 2550 7200
-F 0 "C8" H 2600 7300 50  0000 L CNN
-F 1 "22uF" H 2600 7100 50  0000 L CNN
-	1    2550 7200
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C2
-U 1 1 4DC58D30
-P 950 7150
-F 0 "C2" H 1000 7250 50  0000 L CNN
-F 1 "22uF" H 1000 7050 50  0000 L CNN
-	1    950  7150
-	1    0    0    -1  
-$EndComp
-$Comp
-L SC120 IC1
-U 1 1 4DC58CE2
-P 1750 7000
-F 0 "IC1" H 1750 7350 60  0000 C CNN
-F 1 "SC120" H 1750 6650 60  0000 C CNN
-	1    1750 7000
-	1    0    0    -1  
-$EndComp
 Text Label 9900 5600 0    60   ~ 0
 SC_SW
 Text Label 8200 6000 1    60   ~ 0
@@ -1516,10 +1430,10 @@ RST_SIM
 Text Label 9400 6000 1    60   ~ 0
 VCC_SIM
 $Comp
-L GND #PWR041
+L GND #PWR033
 U 1 1 4DC55B6C
 P 8800 6750
-F 0 "#PWR041" H 8800 6750 30  0001 C CNN
+F 0 "#PWR033" H 8800 6750 30  0001 C CNN
 F 1 "GND" H 8800 6680 30  0001 C CNN
 	1    8800 6750
 	0    1    1    0   
@@ -1548,32 +1462,33 @@ U 1 1 4DC51F05
 P 10900 6500
 F 0 "P3" H 10950 6850 60  0000 C CNN
 F 1 "REBELSIM" V 11100 6500 60  0000 C CNN
+F 2 "HE10_20D" H 10900 6500 60  0001 C CNN
 	1    10900 6500
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR042
+L 3V3 #PWR034
 U 1 1 4DC5061E
 P 2050 4400
-F 0 "#PWR042" H 2050 4500 40  0001 C CNN
+F 0 "#PWR034" H 2050 4500 40  0001 C CNN
 F 1 "3V3" H 2050 4525 40  0000 C CNN
 	1    2050 4400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR043
+L GND #PWR035
 U 1 1 4D037F90
 P 1550 4900
-F 0 "#PWR043" H 1550 4900 30  0001 C CNN
+F 0 "#PWR035" H 1550 4900 30  0001 C CNN
 F 1 "GND" H 1550 4830 30  0001 C CNN
 	1    1550 4900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR044
+L GND #PWR036
 U 1 1 4D037F8C
 P 1900 5100
-F 0 "#PWR044" H 1900 5100 30  0001 C CNN
+F 0 "#PWR036" H 1900 5100 30  0001 C CNN
 F 1 "GND" H 1900 5030 30  0001 C CNN
 	1    1900 5100
 	0    1    1    0   
@@ -1584,6 +1499,7 @@ U 1 1 4D037E30
 P 1550 4600
 F 0 "C3" H 1600 4700 50  0000 L CNN
 F 1 "100nF" H 1600 4500 50  0000 L CNN
+F 2 "SM0603" H 1550 4600 60  0001 C CNN
 	1    1550 4600
 	1    0    0    -1  
 $EndComp
@@ -1595,8 +1511,8 @@ Text Notes 10350 6000 0    100  ~ 20
 PHONE
 Text Notes 10350 4300 0    100  ~ 20
 SIM
-Text Notes 3600 6550 0    100  ~ 20
-USB-PWR
+Text Notes 2000 6200 0    100  ~ 20
+POWER
 Text Notes 3450 3900 0    100  ~ 20
 XTAL
 Text Notes 1450 3950 0    100  ~ 20
@@ -1613,6 +1529,7 @@ U 1 1 4D020EDF
 P 4500 5800
 F 0 "C20" H 4550 5900 50  0000 L CNN
 F 1 "100nF" H 4550 5700 50  0000 L CNN
+F 2 "SM0603" H 4500 5800 60  0001 C CNN
 	1    4500 5800
 	-1   0    0    -1  
 $EndComp
@@ -1620,16 +1537,17 @@ $Comp
 L C C15
 U 1 1 4D020ED8
 P 3500 5400
-F 0 "C15" H 3550 5500 50  0000 L CNN
-F 1 "100nF" H 3550 5300 50  0000 L CNN
+F 0 "C15" H 3550 5600 50  0000 L CNN
+F 1 "100nF" H 3550 5500 50  0000 L CNN
+F 2 "SM0603" H 3500 5400 60  0001 C CNN
 	1    3500 5400
-	1    0    0    1   
+	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR045
+L GND #PWR037
 U 1 1 4D020E3B
 P 1850 3950
-F 0 "#PWR045" H 1850 3950 30  0001 C CNN
+F 0 "#PWR037" H 1850 3950 30  0001 C CNN
 F 1 "GND" H 1850 3880 30  0001 C CNN
 	1    1850 3950
 	0    1    1    0   
@@ -1640,6 +1558,7 @@ U 1 1 4D020DD3
 P 2250 3950
 F 0 "C6" H 2300 4050 50  0000 L CNN
 F 1 "10nF" H 2300 3850 50  0000 L CNN
+F 2 "SM0603" H 2250 3950 60  0001 C CNN
 	1    2250 3950
 	0    -1   -1   0   
 $EndComp
@@ -1649,6 +1568,7 @@ U 1 1 4D020DCD
 P 2850 3700
 F 0 "C10" H 2900 3800 50  0000 L CNN
 F 1 "1nF" H 2900 3600 50  0000 L CNN
+F 2 "SM0603" H 2850 3700 60  0001 C CNN
 	1    2850 3700
 	0    -1   -1   0   
 $EndComp
@@ -1667,6 +1587,7 @@ U 1 1 4D020BEB
 P 2800 5000
 F 0 "C9" H 2850 5100 50  0000 L CNN
 F 1 "100nF" H 2850 4900 50  0000 L CNN
+F 2 "SM0603" H 2800 5000 60  0001 C CNN
 	1    2800 5000
 	1    0    0    -1  
 $EndComp
@@ -1676,14 +1597,15 @@ U 1 1 4D020BDE
 P 2400 4900
 F 0 "C7" H 2450 5000 50  0000 L CNN
 F 1 "100nF" H 2450 4800 50  0000 L CNN
+F 2 "SM0603" H 2400 4900 60  0001 C CNN
 	1    2400 4900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR046
+L GND #PWR038
 U 1 1 4D020854
 P 4450 850
-F 0 "#PWR046" H 4450 850 30  0001 C CNN
+F 0 "#PWR038" H 4450 850 30  0001 C CNN
 F 1 "GND" H 4450 780 30  0001 C CNN
 	1    4450 850 
 	-1   0    0    1   
@@ -1716,27 +1638,19 @@ U 1 1 4CFCD6C9
 P 3350 1450
 F 0 "P1" H 3350 2000 60  0000 C CNN
 F 1 "JTAG" H 3350 900 50  0000 C CNN
+F 2 "bornier4" H 3350 1450 60  0001 C CNN
 	1    3350 1450
 	1    0    0    -1  
 $EndComp
-$Comp
-L ISO7816_NO SC1
-U 1 1 4CFA9F7B
-P 9800 5000
-F 0 "SC1" H 9800 5250 60  0000 C CNN
-F 1 "SC_ID-000" H 9800 4700 60  0000 C CNN
-	1    9800 5000
-	1    0    0    -1  
-$EndComp
 Text Label 10000 6550 0    60   ~ 0
 I/O_PHONE
 Text Label 10000 6350 0    60   ~ 0
 RST_PHONE
 $Comp
-L GND #PWR047
+L GND #PWR039
 U 1 1 4CF7CFEB
 P 10100 6750
-F 0 "#PWR047" H 10100 6750 30  0001 C CNN
+F 0 "#PWR039" H 10100 6750 30  0001 C CNN
 F 1 "GND" H 10100 6680 30  0001 C CNN
 	1    10100 6750
 	0    1    1    0   
@@ -1754,10 +1668,10 @@ RST_SIM
 Text Label 9150 4850 2    60   ~ 0
 VCC_SIM
 $Comp
-L GND #PWR048
+L GND #PWR040
 U 1 1 4CF7C43B
 P 10800 4850
-F 0 "#PWR048" H 10800 4850 30  0001 C CNN
+F 0 "#PWR040" H 10800 4850 30  0001 C CNN
 F 1 "GND" H 10800 4780 30  0001 C CNN
 	1    10800 4850
 	0    -1   -1   0   
@@ -1784,31 +1698,22 @@ Text Label 7600 4300 0    60   ~ 0
 VCC_SIM
 Text Label 7600 4000 0    60   ~ 0
 SW_SIM
-$Comp
-L ISO7816_NO SC1
-U 2 1 4CF6A13B
-P 9800 4550
-F 0 "SC1" H 9800 4800 60  0000 C CNN
-F 1 "SC_ID-000" H 9800 4700 60  0000 C CNN
-	2    9800 4550
-	1    0    0    -1  
-$EndComp
 NoConn ~ 9250 5150
 NoConn ~ 10350 5150
 $Comp
-L LED D3
+L LED D5
 U 1 1 4CF5471F
 P 6100 6700
-F 0 "D3" H 5850 6750 50  0000 C CNN
+F 0 "D5" H 5850 6750 50  0000 C CNN
 F 1 "GREEN" H 6400 6750 50  0000 C CNN
 	1    6100 6700
 	-1   0    0    -1  
 $EndComp
 $Comp
-L LED D2
+L LED D4
 U 1 1 4CF54717
 P 6100 6500
-F 0 "D2" H 5850 6550 50  0000 C CNN
+F 0 "D4" H 5850 6550 50  0000 C CNN
 F 1 "RED" H 6350 6550 50  0000 C CNN
 	1    6100 6500
 	-1   0    0    -1  
@@ -1828,10 +1733,10 @@ DRXD
 Text Label 7600 3800 0    60   ~ 0
 DTXD
 $Comp
-L 3V3 #PWR049
+L 3V3 #PWR041
 U 1 1 4CE9AE51
 P 9300 2800
-F 0 "#PWR049" H 9300 2900 40  0001 C CNN
+F 0 "#PWR041" H 9300 2900 40  0001 C CNN
 F 1 "3V3" H 9300 2925 40  0000 C CNN
 	1    9300 2800
 	1    0    0    -1  
@@ -1842,14 +1747,15 @@ U 1 1 4CE9ADCF
 P 9950 3100
 F 0 "P2" H 9950 3450 60  0000 C CNN
 F 1 "DEBUG" V 10150 3100 60  0000 C CNN
+F 2 "bornier6" H 9950 3100 60  0001 C CNN
 	1    9950 3100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR050
+L GND #PWR042
 U 1 1 4CE9AA96
 P 9450 2700
-F 0 "#PWR050" H 9450 2700 30  0001 C CNN
+F 0 "#PWR042" H 9450 2700 30  0001 C CNN
 F 1 "GND" H 9450 2630 30  0001 C CNN
 	1    9450 2700
 	-1   0    0    1   
@@ -1864,19 +1770,19 @@ Text Label 4450 2200 0    60   ~ 0
 TDI
 NoConn ~ 5050 2600
 $Comp
-L GND #PWR051
+L GND #PWR043
 U 1 1 4CE9A7C1
 P 3900 2000
-F 0 "#PWR051" H 3900 2000 30  0001 C CNN
+F 0 "#PWR043" H 3900 2000 30  0001 C CNN
 F 1 "GND" H 3900 1930 30  0001 C CNN
 	1    3900 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3V3 #PWR052
+L 3V3 #PWR044
 U 1 1 4CE9A701
 P 1600 950
-F 0 "#PWR052" H 1600 1050 40  0001 C CNN
+F 0 "#PWR044" H 1600 1050 40  0001 C CNN
 F 1 "3V3" H 1600 1075 40  0000 C CNN
 	1    1600 950 
 	1    0    0    -1  
@@ -1929,10 +1835,10 @@ $EndComp
 NoConn ~ 2900 1900
 NoConn ~ 2900 1800
 $Comp
-L 1V8 #PWR053
+L 1V8 #PWR045
 U 1 1 4CE94C54
 P 3200 4850
-F 0 "#PWR053" H 3200 4990 20  0001 C CNN
+F 0 "#PWR045" H 3200 4990 20  0001 C CNN
 F 1 "1V8" H 3200 4960 30  0000 C CNN
 	1    3200 4850
 	1    0    0    -1  
@@ -1960,19 +1866,19 @@ DDM
 Text Label 4350 2900 0    60   ~ 0
 DDP
 $Comp
-L 3V3 #PWR054
+L 3V3 #PWR046
 U 1 1 4CE91A30
 P 750 4100
-F 0 "#PWR054" H 750 4200 40  0001 C CNN
+F 0 "#PWR046" H 750 4200 40  0001 C CNN
 F 1 "3V3" H 750 4225 40  0000 C CNN
 	1    750  4100
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR055
+L GND #PWR047
 U 1 1 4CE9163C
 P 3600 3400
-F 0 "#PWR055" H 3600 3400 30  0001 C CNN
+F 0 "#PWR047" H 3600 3400 30  0001 C CNN
 F 1 "GND" H 3600 3330 30  0001 C CNN
 	1    3600 3400
 	0    1    1    0   
@@ -1983,6 +1889,7 @@ U 1 1 4CE91633
 P 4000 3700
 F 0 "C18" V 3900 3850 50  0000 L CNN
 F 1 "10pF" V 4050 3850 50  0000 L CNN
+F 2 "SM0603" H 4000 3700 60  0001 C CNN
 	1    4000 3700
 	0    1    1    0   
 $EndComp
@@ -1992,6 +1899,7 @@ U 1 1 4CE9162F
 P 4000 3100
 F 0 "C17" V 3900 3250 50  0000 L CNN
 F 1 "10pF" V 4050 3250 50  0000 L CNN
+F 2 "SM0603" H 4000 3100 60  0001 C CNN
 	1    4000 3100
 	0    1    1    0   
 $EndComp
@@ -2005,30 +1913,12 @@ F 1 "18.432MHz" V 4500 3000 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +5V #PWR056
-U 1 1 4CE91241
-P 3350 7000
-F 0 "#PWR056" H 3350 7090 20  0001 C CNN
-F 1 "+5V" H 3350 7090 30  0000 C CNN
-	1    3350 7000
-	0    -1   -1   0   
-$EndComp
-$Comp
-L GND #PWR057
+L GND #PWR048
 U 1 1 4CE8FFA5
 P 4750 6150
-F 0 "#PWR057" H 4750 6150 30  0001 C CNN
+F 0 "#PWR048" H 4750 6150 30  0001 C CNN
 F 1 "GND" H 4750 6080 30  0001 C CNN
 	1    4750 6150
 	1    0    0    -1  
 $EndComp
-$Comp
-L +5V #PWR058
-U 1 1 4CE8FE3E
-P 650 2050
-F 0 "#PWR058" H 650 2140 20  0001 C CNN
-F 1 "+5V" H 650 2140 30  0000 C CNN
-	1    650  2050
-	1    0    0    -1  
-$EndComp
 $EndSCHEMATC
diff --git a/hardware/kicad/lib/SIMtrace.bak b/hardware/kicad/lib/SIMtrace.bak
index 05bcf6a..e754135 100644
--- a/hardware/kicad/lib/SIMtrace.bak
+++ b/hardware/kicad/lib/SIMtrace.bak
@@ -1,429 +1,271 @@
-EESchema-LIBRARY Version 2.3  Date: Mo 09 Mai 2011 17:03:15 CEST
-#
-# DEBUG
-#
-DEF DEBUG P 0 30 Y Y 1 F N
-F0 "P" 0 350 60 H V C CNN
-F1 "DEBUG" 200 0 60 V V C CNN
-DRAW
-S -100 300 150 -300 0 1 0 N
-X GND 1 -350 250 250 R 60 60 1 1 W I
-X CTS 2 -350 150 250 R 60 60 1 1 O I
-X VCC 3 -350 50 250 R 60 60 1 1 W I
-X TXD 4 -350 -50 250 R 60 60 1 1 O I
-X RXD 5 -350 -150 250 R 60 60 1 1 I I
-X RTS 6 -350 -250 250 R 60 60 1 1 I I
-ENDDRAW
-ENDDEF
-#
-# FLASH_SPI
-#
-DEF FLASH_SPI U 0 40 Y Y 1 F N
-F0 "U" 0 300 60 H V C CNN
-F1 "FLASH_SPI" 0 -300 60 H V C CNN
-DRAW
-S -350 250 350 -250 0 1 0 N
-X /CS 1 -600 150 250 R 60 60 1 1 I
-X SO 2 -600 50 250 R 60 60 1 1 O
-X /WP 3 -600 -50 250 R 60 60 1 1 O
-X GND 4 -600 -150 250 R 60 60 1 1 W
-X SI 5 600 -150 250 L 60 60 1 1 I
-X SCK 6 600 -50 250 L 60 60 1 1 I
-X /HOLD 7 600 50 250 L 60 60 1 1 W
-X VCC 8 600 150 250 L 60 60 1 1 W
-ENDDRAW
-ENDDEF
-#
-# JACK
-#
-DEF JACK J 0 0 Y Y 1 F N
-F0 "J" 0 150 50 H V L BNN
-F1 "JACK" -50 -200 50 H V L BNN
-DRAW
-P 2 1 0 0  -100 100  -100 50 N
-P 2 1 0 0  0 -40  -30 -100 N
-P 2 1 0 0  30 -100  0 -40 N
-P 2 1 0 0  100 -100  30 -100 N
-P 2 1 0 0  100 0  100 -100 N
-P 2 1 0 0  200 -100  100 -100 N
-P 2 1 0 0  200 0  100 0 N
-P 2 1 0 0  200 100  -100 100 N
-S -130 -100 -70 50 1 1 0 F
-P 6 1 1 0  100 -100  80 -50  80 -50  120 -50  120 -50  100 -100 F
-X TIP 1 300 0 100 L 40 30 1 1 P
-X RING 2 300 -100 100 L 40 30 1 1 P
-X SLEEVE 3 300 100 100 L 40 30 1 1 P
-ENDDRAW
-ENDDEF
-#
-# JTAG
-#
-DEF JTAG P 0 10 Y Y 1 F N
-F0 "P" 0 550 60 H V C CNN
-F1 "JTAG" 0 -550 50 H V C CNN
-DRAW
-S -150 500 150 -500 0 1 0 N
-X VREF 1 -450 450 300 R 60 30 1 1 P I
-X VCC 2 450 450 300 L 60 30 1 1 P I
-X nTRST 3 -450 350 300 R 60 30 1 1 P I
-X GND 4 450 350 300 L 60 30 1 1 P I
-X TDI 5 -450 250 300 R 60 30 1 1 P I
-X GND 6 450 250 300 L 60 30 1 1 P I
-X TMS 7 -450 150 300 R 60 30 1 1 P I
-X GND 8 450 150 300 L 60 30 1 1 P I
-X TCK 9 -450 50 300 R 60 30 1 1 P I
-X GND 10 450 50 300 L 60 30 1 1 P I
-X GND 20 450 -450 300 L 60 30 1 1 P I
-X RTCK 11 -450 -50 300 R 60 30 1 1 P I
-X GND 12 450 -50 300 L 60 30 1 1 P I
-X TDO 13 -450 -150 300 R 60 30 1 1 P I
-X GND 14 450 -150 300 L 60 30 1 1 P I
-X nSRST 15 -450 -250 300 R 60 30 1 1 P I
-X GND 16 450 -250 300 L 60 30 1 1 P I
-X DBGRQ 17 -450 -350 300 R 60 30 1 1 P I
-X GND 18 450 -350 300 L 60 30 1 1 P I
-X DGBACK 19 -450 -450 300 R 60 30 1 1 P I
-ENDDRAW
-ENDDEF
-#
-# LM3046
-#
-DEF LM3046 Q 0 40 Y Y 5 F N
-F0 "Q" 0 225 50 H V C CNN
-F1 "LM3046" 0 -175 50 H V C CNN
-$FPLIST
- SO14E
-$ENDFPLIST
-DRAW
-T 0 100 50 40 0 0 0 B  Normal 0 C C
-T 0 50 -100 40 0 0 0 C  Normal 0 C C
-T 0 -50 -100 40 0 0 0 E  Normal 0 C C
-P 3 0 1 0  -100 -50  -25 25  -25 25 N
-P 3 0 1 0  -75 25  75 25  75 25 N
-P 3 0 1 0  25 25  100 -50  100 -50 N
-P 6 0 1 0  -100 -25  -100 -50  -75 -50  -100 -25  -100 -25  -100 -25 F
-X ~ 1 200 -50 100 L 50 50 1 1 I
-X ~ 2 0 150 125 D 50 50 1 1 I
-X ~ 3 -200 -50 100 R 50 50 1 1 O
-X ~ 3 -200 -50 100 R 50 50 2 1 O
-X ~ 4 0 150 125 D 50 50 2 1 I
-X ~ 5 200 -50 100 L 50 50 2 1 I
-X ~ 6 0 150 125 D 50 50 3 1 I
-X ~ 7 -200 -50 100 R 50 50 3 1 O
-X ~ 8 200 -50 100 L 50 50 3 1 I
-X ~ 9 0 150 125 D 50 50 4 1 I
-X ~ 10 -200 -50 100 R 50 50 4 1 O
-X ~ 11 200 -50 100 L 50 50 4 1 I
-X ~ 12 0 150 125 D 50 50 5 1 I
-X ~ 13 -200 -50 100 R 50 50 5 1 O
-X ~ 14 200 -50 100 L 50 50 5 1 I
-ENDDRAW
-ENDDEF
-#
-# LM3046M
-#
-DEF LM3046M Q 0 40 Y Y 5 F N
-F0 "Q" 0 225 50 H V C CNN
-F1 "LM3046M" 0 -175 50 H V C CNN
-$FPLIST
- SO14E
-$ENDFPLIST
-DRAW
-T 0 100 50 40 0 0 0 B  Normal 0 C C
-T 0 50 -100 40 0 0 0 C  Normal 0 C C
-T 0 -50 -100 40 0 0 0 E  Normal 0 C C
-P 3 0 1 0  -100 -50  -25 25  -25 25 N
-P 3 0 1 0  -75 25  75 25  75 25 N
-P 3 0 1 0  25 25  100 -50  100 -50 N
-P 6 0 1 0  -100 -25  -100 -50  -75 -50  -100 -25  -100 -25  -100 -25 F
-X ~ 1 200 -50 100 L 50 50 1 1 I
-X ~ 2 0 150 125 D 50 50 1 1 I
-X ~ 3 -200 -50 100 R 50 50 1 1 O
-X ~ 3 -200 -50 100 R 50 50 2 1 O
-X ~ 4 0 150 125 D 50 50 2 1 I
-X ~ 5 200 -50 100 L 50 50 2 1 I
-X ~ 6 0 150 125 D 50 50 3 1 I
-X ~ 7 -200 -50 100 R 50 50 3 1 O
-X ~ 8 200 -50 100 L 50 50 3 1 I
-X ~ 9 0 150 125 D 50 50 4 1 I
-X ~ 10 -200 -50 100 R 50 50 4 1 O
-X ~ 11 200 -50 100 L 50 50 4 1 I
-X ~ 12 0 150 125 D 50 50 5 1 I
-X ~ 13 -200 -50 100 R 50 50 5 1 O
-X ~ 14 200 -50 100 L 50 50 5 1 I
-ENDDRAW
-ENDDEF
-#
-# QS3244
-#
-DEF QS3244 IC 0 0 Y Y 9 L N
-F0 "IC" -150 200 60 H V C CNN
-F1 "QS3244" -225 -175 60 H V C CNN
-DRAW
-C -85 0 10 1 1 0 N
-P 3 1 1 0  -200 0  -250 0  -250 0 N
-P 3 1 1 0  0 0  -75 0  -75 0 N
-P 3 1 1 0  0 50  0 -50  0 -50 N
-P 3 1 1 0  25 50  25 -50  25 -50 N
-P 4 1 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 1 1 0  25 25  100 25  100 100  100 100 N
-P 5 1 1 0  -200 50  -100 0  -200 -50  -200 50  -200 50 N
-X /1G 1 -400 0 150 R 60 60 1 1 I
-X 1A1 2 100 250 150 D 60 60 1 1 B
-X 1Y1 18 100 -250 150 U 60 60 1 1 B
-C -85 0 10 2 1 0 N
-P 3 2 1 0  -200 0  -250 0  -250 0 N
-P 3 2 1 0  0 0  -75 0  -75 0 N
-P 3 2 1 0  0 50  0 -50  0 -50 N
-P 3 2 1 0  25 50  25 -50  25 -50 N
-P 4 2 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 2 1 0  25 25  100 25  100 100  100 100 N
-P 5 2 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X /1G 1 -400 0 150 R 60 60 2 1 I
-X 1A2 4 100 250 150 D 60 60 2 1 B
-X 1Y2 16 100 -250 150 U 60 60 2 1 B
-C -85 0 10 3 1 0 N
-P 3 3 1 0  -200 0  -250 0  -250 0 N
-P 3 3 1 0  0 0  -75 0  -75 0 N
-P 3 3 1 0  0 50  0 -50  0 -50 N
-P 3 3 1 0  25 50  25 -50  25 -50 N
-P 4 3 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 3 1 0  25 25  100 25  100 100  100 100 N
-P 5 3 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X /1G 1 -400 0 150 R 60 60 3 1 I
-X 1A3 6 100 250 150 D 60 60 3 1 B
-X 1Y3 14 100 -250 150 U 60 60 3 1 B
-C -85 0 10 4 1 0 N
-P 3 4 1 0  -200 0  -250 0  -250 0 N
-P 3 4 1 0  0 0  -75 0  -75 0 N
-P 3 4 1 0  0 50  0 -50  0 -50 N
-P 3 4 1 0  25 50  25 -50  25 -50 N
-P 4 4 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 4 1 0  25 25  100 25  100 100  100 100 N
-P 5 4 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X /1G 1 -400 0 150 R 60 60 4 1 I
-X 1A4 8 100 250 150 D 60 60 4 1 B
-X 1Y4 12 100 -250 150 U 60 60 4 1 B
-C -85 0 10 5 1 0 N
-P 3 5 1 0  -250 0  -200 0  -200 0 N
-P 3 5 1 0  0 0  -75 0  -75 0 N
-P 3 5 1 0  0 50  0 -50  0 -50 N
-P 3 5 1 0  25 50  25 -50  25 -50 N
-P 4 5 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 5 1 0  25 25  100 25  100 100  100 100 N
-P 5 5 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X 2Y1 9 100 -250 150 U 60 60 5 1 B
-X 2A1 11 100 250 150 D 60 60 5 1 B
-X /2G 19 -400 0 150 R 60 60 5 1 I
-C -85 0 10 6 1 0 N
-P 3 6 1 0  0 0  -75 0  -75 0 N
-P 3 6 1 0  0 50  0 -50  0 -50 N
-P 3 6 1 0  25 50  25 -50  25 -50 N
-P 4 6 1 0  -200 0  -250 0  -250 0  -250 0 N
-P 4 6 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 6 1 0  25 25  100 25  100 100  100 100 N
-P 5 6 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X 2Y2 7 100 -250 150 U 60 60 6 1 B
-X 2A2 13 100 250 150 D 60 60 6 1 B
-X /2G 19 -400 0 150 R 60 60 6 1 I
-C -85 0 10 7 1 0 N
-P 3 7 1 0  -200 0  -250 0  -250 0 N
-P 3 7 1 0  0 0  -75 0  -75 0 N
-P 3 7 1 0  0 50  0 -50  0 -50 N
-P 3 7 1 0  25 50  25 -50  25 -50 N
-P 4 7 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 7 1 0  25 25  100 25  100 100  100 100 N
-P 5 7 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X 2Y3 5 100 -250 150 U 60 60 7 1 B
-X 2A3 15 100 250 150 D 60 60 7 1 B
-X /2G 19 -400 0 150 R 60 60 7 1 I
-C -85 0 10 8 1 0 N
-P 3 8 1 0  -200 0  -250 0  -250 0 N
-P 3 8 1 0  0 0  -75 0  -75 0 N
-P 3 8 1 0  0 50  0 -50  0 -50 N
-P 3 8 1 0  25 50  25 -50  25 -50 N
-P 4 8 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 8 1 0  25 25  100 25  100 100  100 100 N
-P 5 8 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X 2Y4 3 100 -250 150 U 60 60 8 1 B
-X 2A4 17 100 250 150 D 60 60 8 1 B
-X /2G 19 -400 0 150 R 60 60 8 1 I
-X GND 10 100 -250 150 U 60 60 9 1 W
-X VCC 20 100 250 150 D 60 60 9 1 W
-ENDDRAW
-ENDDEF
-#
-# QS3245
-#
-DEF QS3245 IC 0 0 Y Y 9 L N
-F0 "IC" -150 200 60 H V C CNN
-F1 "QS3245" -225 -175 60 H V C CNN
-DRAW
-C -85 0 10 1 1 0 N
-P 3 1 1 0  0 0  -75 0  -75 0 N
-P 3 1 1 0  0 50  0 -50  0 -50 N
-P 3 1 1 0  25 50  25 -50  25 -50 N
-P 4 1 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 1 1 0  25 25  100 25  100 100  100 100 N
-P 5 1 1 0  -200 50  -100 0  -200 -50  -200 50  -200 50 N
-X A1 2 100 250 150 D 60 60 1 1 B
-X /OE 15 -350 0 150 R 60 60 1 1 I
-X B1 18 100 -250 150 U 60 60 1 1 W
-C -85 0 10 2 1 0 N
-P 3 2 1 0  0 0  -75 0  -75 0 N
-P 3 2 1 0  0 50  0 -50  0 -50 N
-P 3 2 1 0  25 50  25 -50  25 -50 N
-P 4 2 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 2 1 0  25 25  100 25  100 100  100 100 N
-P 5 2 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X A2 3 100 250 150 D 60 60 2 1 B
-X /OE 15 -350 0 150 R 60 60 2 1 I
-X B2 17 100 -250 150 U 60 60 2 1 W
-C -85 0 10 3 1 0 N
-P 3 3 1 0  0 0  -75 0  -75 0 N
-P 3 3 1 0  0 50  0 -50  0 -50 N
-P 3 3 1 0  25 50  25 -50  25 -50 N
-P 4 3 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 3 1 0  25 25  100 25  100 100  100 100 N
-P 5 3 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X A3 4 100 250 150 D 60 60 3 1 B
-X /OE 15 -350 0 150 R 60 60 3 1 I
-X B3 16 100 -250 150 U 60 60 3 1 W
-C -85 0 10 4 1 0 N
-P 3 4 1 0  0 0  -75 0  -75 0 N
-P 3 4 1 0  0 50  0 -50  0 -50 N
-P 3 4 1 0  25 50  25 -50  25 -50 N
-P 4 4 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 4 1 0  25 25  100 25  100 100  100 100 N
-P 5 4 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X A4 5 100 250 150 D 60 60 4 1 B
-X B4 14 100 -250 150 U 60 60 4 1 W
-X /OE 15 -350 0 150 R 60 60 4 1 I
-C -85 0 10 5 1 0 N
-P 3 5 1 0  0 0  -75 0  -75 0 N
-P 3 5 1 0  0 50  0 -50  0 -50 N
-P 3 5 1 0  25 50  25 -50  25 -50 N
-P 4 5 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 5 1 0  25 25  100 25  100 100  100 100 N
-P 5 5 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X A5 6 100 250 150 D 60 60 5 1 B
-X B5 14 100 -250 150 U 60 60 5 1 W
-X /OE 15 -350 0 150 R 60 60 5 1 I
-C -85 0 10 6 1 0 N
-P 3 6 1 0  0 0  -75 0  -75 0 N
-P 3 6 1 0  0 50  0 -50  0 -50 N
-P 3 6 1 0  25 50  25 -50  25 -50 N
-P 4 6 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 6 1 0  25 25  100 25  100 100  100 100 N
-P 5 6 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X A6 7 100 250 150 D 60 60 6 1 B
-X B6 13 100 -250 150 U 60 60 6 1 W
-X /OE 15 -350 0 150 R 60 60 6 1 I
-C -85 0 10 7 1 0 N
-P 3 7 1 0  0 0  -75 0  -75 0 N
-P 3 7 1 0  0 50  0 -50  0 -50 N
-P 3 7 1 0  25 50  25 -50  25 -50 N
-P 4 7 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 7 1 0  25 25  100 25  100 100  100 100 N
-P 5 7 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X A7 8 100 250 150 D 60 60 7 1 B
-X B7 12 100 -250 150 U 60 60 7 1 W
-X /OE 15 -350 0 150 R 60 60 7 1 I
-C -85 0 10 8 1 0 N
-P 3 8 1 0  0 0  -75 0  -75 0 N
-P 3 8 1 0  0 50  0 -50  0 -50 N
-P 3 8 1 0  25 50  25 -50  25 -50 N
-P 4 8 1 0  25 -25  100 -25  100 -100  100 -100 N
-P 4 8 1 0  25 25  100 25  100 100  100 100 N
-P 5 8 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
-X A8 9 100 250 150 D 60 60 8 1 B
-X B8 11 100 -250 150 U 60 60 8 1 W
-X /OE 15 -350 0 150 R 60 60 8 1 I
-X GND 10 100 -250 150 U 60 60 9 1 W
-X VCC 20 100 250 150 D 60 60 9 1 W
-ENDDRAW
-ENDDEF
-#
-# SC120
-#
-DEF SC120 IC 0 40 Y Y 1 F N
-F0 "IC" 0 350 60 H V C CNN
-F1 "SC120" 0 -350 60 H V C CNN
-DRAW
-S -250 250 250 -250 0 1 0 N
-X IN 1 -500 150 250 R 60 60 1 1 W
-X GND 2 -500 -150 250 R 60 60 1 1 W
-X LX 3 500 150 250 L 60 60 1 1 I
-X OUT 4 500 0 250 L 60 60 1 1 w
-X FB 5 500 -150 250 L 60 60 1 1 W
-X EN 6 -500 0 250 R 60 60 1 1 I
-ENDDRAW
-ENDDEF
-#
-# TPS736XX
-#
-DEF TPS736XX IC 0 40 Y Y 1 F N
-F0 "IC" 0 450 60 H V C CNN
-F1 "TPS736XX" 0 350 60 H V C CNN
-DRAW
-S -250 300 250 -50 0 1 0 N
-X OUT 1 400 200 150 L 60 60 1 1 w
-X NR 3 400 50 150 L 60 60 1 1 I
-X GND 4 0 -200 150 U 60 60 1 1 W
-X EN 5 -400 50 150 R 60 60 1 1 I
-X IN 8 -400 200 150 R 60 60 1 1 W
-ENDDRAW
-ENDDEF
-#
-# USB-B_MINI
-#
-DEF USB-B_MINI J 0 40 Y Y 1 F N
-F0 "J" 50 450 50 H V L BNN
-F1 "USB-B_MINI" -100 -450 50 H V L BNN
-F2 "~" 0 150 50 H I C CNN
-DRAW
-P 2 1 0 0  -100 250  -100 -250 N
-P 2 1 0 0  -50 -300  0 -300 N
-P 2 1 0 0  -50 300  0 300 N
-P 2 1 0 0  0 -200  50 -250 N
-P 2 1 0 0  0 200  0 -200 N
-P 2 1 0 0  50 -250  150 -250 N
-P 2 1 0 0  50 250  0 200 N
-P 2 1 0 0  100 -350  200 -350 N
-P 2 1 0 0  100 350  200 350 N
-P 2 1 0 0  150 -250  150 250 N
-P 2 1 0 0  150 250  50 250 N
-P 2 1 0 0  250 -300  250 300 N
-A -50 -250 50 -1799 -901 1 1 0 N -100 -250 -50 -300
-A -50 250 50 901 1799 1 1 0 N -50 300 -100 250
-A 0 -350 50 370 899 1 1 0 N 40 -320 0 -300
-A 0 350 50 -899 -369 1 1 0 N 0 300 40 320
-A 100 -275 75 -1430 -901 1 1 0 N 40 -320 100 -350
-A 100 275 75 901 1431 1 1 0 N 100 350 40 320
-A 200 -300 50 -899 -1 1 1 0 N 200 -350 250 -300
-A 200 300 50 1 899 1 1 0 N 250 300 200 350
-X VCC 1 400 200 250 L 40 40 1 1 w
-X D- 2 400 100 250 L 40 40 1 1 B
-X D+ 3 400 0 250 L 40 40 1 1 B
-X ID 4 400 -100 250 L 40 40 1 1 P
-X GND 5 400 -200 250 L 40 40 1 1 W
-ENDDRAW
-ENDDEF
-#
-# USBUF
-#
-DEF USBUF IC 0 40 Y Y 1 F N
-F0 "IC" 0 400 60 H V C CNN
-F1 "USBUF" 0 -300 60 H V C CNN
-DRAW
-S -250 300 250 -200 0 1 0 N
-X D1 1 -400 200 150 R 60 60 1 1 B
-X GND 2 -400 50 150 R 60 60 1 1 W
-X D2 3 -400 -100 150 R 60 60 1 1 B
-X D3 4 400 -100 150 L 60 60 1 1 B
-X VCC 5 400 50 150 L 60 60 1 1 W
-X D4 6 400 200 150 L 60 60 1 1 B
-ENDDRAW
-ENDDEF
-#
-#End Library
+PCBNEW-LibModule-V1  Di 10 Mai 2011 17:13:28 CEST
+$INDEX
+CAP_AVE_E
+SC_ID0
+SC_ID000
+SOD123
+$EndINDEX
+$MODULE CAP_AVE_E
+Po 0 0 0 15 4CFCEE9A 00000000 ~~
+Li CAP_AVE_E
+Sc 00000000
+AR
+Op 0 0 0
+T0 -39 2283 600 600 0 120 N V 21 N"CAP_AVE_E"
+T1 -79 -2244 600 600 0 120 N V 21 N"VAL**"
+T2 -630 -748 600 600 0 120 N V 21 N"+"
+DC 0 0 0 -1575 150 21
+DS -1654 -1142 -1654 1654 150 21
+DS -1142 -1654 1142 -1654 150 21
+DS -1654 -1142 -1142 -1654 150 21
+DS 1654 1654 1654 -1142 150 21
+DS 1142 -1654 1654 -1142 150 21
+DS -1654 1654 1654 1654 150 21
+$PAD
+Sh "1" R 315 1417 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 0 -1102
+$EndPAD
+$EndMODULE  CAP_AVE_E
+$MODULE SC_ID0
+Po 0 0 0 15 4D0CF3BD 00000000 ~~
+Li SC_ID0
+Sc 00000000
+AR
+Op 0 0 0
+T0 -7087 984 600 600 0 120 N V 21 N"SC_ID0"
+T1 -7087 -984 600 600 0 120 N V 21 N"SC**"
+DC -11417 -3937 -10827 -4370 150 21
+DC -11417 0 -11063 -394 150 21
+DC -11417 3937 -10787 3583 150 21
+DC 11417 3937 11890 3386 150 21
+DC 11417 0 11772 -394 150 21
+DC 11417 -3543 11693 -4213 150 21
+DS -12205 -7874 12205 -7874 150 21
+DS 12205 -7874 12205 7874 150 21
+DS 12205 7874 -12205 7874 150 21
+DS -12205 7874 -12205 -7874 150 21
+$PAD
+Sh "" C 1260 1260 0 0 0
+Dr 1260 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -11417 -3937
+$EndPAD
+$PAD
+Sh "" C 1260 1260 0 0 0
+Dr 1260 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -11417 3937
+$EndPAD
+$PAD
+Sh "" C 1260 1260 0 0 0
+Dr 1260 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 11417 3937
+$EndPAD
+$PAD
+Sh "" C 1260 1260 0 0 0
+Dr 1260 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 11417 -3543
+$EndPAD
+$PAD
+Sh "" C 866 866 0 0 0
+Dr 866 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -11417 0
+$EndPAD
+$PAD
+Sh "" C 866 866 0 0 0
+Dr 866 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 11417 0
+$EndPAD
+$PAD
+Sh "1" C 591 591 0 0 0
+Dr 394 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -291 -7500
+$EndPAD
+$PAD
+Sh "2" C 591 591 0 0 0
+Dr 394 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 709 -7500
+$EndPAD
+$PAD
+Sh "3" C 591 591 0 0 0
+Dr 394 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 1709 -7500
+$EndPAD
+$PAD
+Sh "4" C 591 591 0 0 0
+Dr 394 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 2709 -7500
+$EndPAD
+$PAD
+Sh "5" C 591 591 0 0 0
+Dr 394 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -291 7500
+$EndPAD
+$PAD
+Sh "6" C 591 591 0 0 0
+Dr 394 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 709 7500
+$EndPAD
+$PAD
+Sh "7" C 591 591 0 0 0
+Dr 394 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 1709 7500
+$EndPAD
+$PAD
+Sh "8" C 591 591 0 0 0
+Dr 394 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 2709 7500
+$EndPAD
+$PAD
+Sh "9" C 591 591 0 0 0
+Dr 394 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -1791 7500
+$EndPAD
+$PAD
+Sh "10" C 591 591 0 0 0
+Dr 394 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -1791 6500
+$EndPAD
+$EndMODULE  SC_ID0
+$MODULE SC_ID000
+Po 0 0 0 15 4D0F4692 00000000 ~~
+Li SC_ID000
+Sc 00000000
+AR
+Op 0 0 0
+T0 0 -1181 600 600 0 120 N V 21 N"SC_ID000"
+T1 0 1181 600 600 0 120 N V 21 N"VAL**"
+DS -3681 5482 -2470 5482 150 21
+DS -2470 5482 -2470 4764 150 21
+DS -2470 4764 3681 4764 150 21
+DS 3681 4764 3681 -5482 150 21
+DS 3681 -5482 -3681 -5482 150 21
+DS -3681 -5482 -3681 5482 150 21
+$PAD
+Sh "" R 669 1575 0 0 0
+Dr 0 0 0
+At CONN N 00808000
+Ne 0 ""
+Po 4016 -4104
+$EndPAD
+$PAD
+Sh "" R 669 1575 0 0 0
+Dr 0 0 0
+At CONN N 00808000
+Ne 0 ""
+Po -4016 -4104
+$EndPAD
+$PAD
+Sh "1" R 394 906 0 0 0
+Dr 0 0 0
+At CONN N 00808000
+Ne 0 ""
+Po -1244 5344
+$EndPAD
+$PAD
+Sh "5" R 394 906 0 0 0
+Dr 0 0 0
+At CONN N 00808000
+Ne 0 ""
+Po -744 5344
+$EndPAD
+$PAD
+Sh "2" R 394 906 0 0 0
+Dr 0 0 0
+At CONN N 00808000
+Ne 0 ""
+Po -244 5344
+$EndPAD
+$PAD
+Sh "6" R 394 906 0 0 0
+Dr 0 0 0
+At CONN N 00808000
+Ne 0 ""
+Po 256 5344
+$EndPAD
+$PAD
+Sh "3" R 394 906 0 0 0
+Dr 0 0 0
+At CONN N 00808000
+Ne 0 ""
+Po 756 5344
+$EndPAD
+$PAD
+Sh "7" R 394 906 0 0 0
+Dr 0 0 0
+At CONN N 00808000
+Ne 0 ""
+Po 1256 5344
+$EndPAD
+$PAD
+Sh "9" R 197 906 0 0 0
+Dr 0 0 0
+At CONN N 00808000
+Ne 0 ""
+Po 2650 5344
+$EndPAD
+$PAD
+Sh "10" R 197 906 0 0 0
+Dr 0 0 0
+At CONN N 00808000
+Ne 0 ""
+Po 3161 5344
+$EndPAD
+$EndMODULE  SC_ID000
+$MODULE SOD123
+Po 0 0 0 15 4DC95616 00000000 ~~
+Li SOD123
+Sc 00000000
+AR 
+Op 0 0 0
+T0 0 1000 600 600 0 120 N V 21 N"SOD123"
+T1 0 -1000 600 600 0 120 N V 21 N"VAL**"
+$PAD
+Sh "2" R 358 480 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 645 0
+$EndPAD
+$PAD
+Sh "1" R 358 480 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -645 0
+$EndPAD
+$EndMODULE  SOD123
+$EndLIBRARY
diff --git a/hardware/kicad/lib/SIMtrace.mdc b/hardware/kicad/lib/SIMtrace.mdc
index 2963028..b8a62de 100644
--- a/hardware/kicad/lib/SIMtrace.mdc
+++ b/hardware/kicad/lib/SIMtrace.mdc
@@ -1,3 +1,3 @@
-PCBNEW-LibDoc----V1  Mo 20 Dez 2010 13:05:41 CET
+PCBNEW-LibDoc----V1  Di 10 Mai 2011 17:13:33 CEST
 #
 $EndLIBDOC
diff --git a/hardware/kicad/lib/SIMtrace.mod b/hardware/kicad/lib/SIMtrace.mod
index f9d0850..8ce765f 100644
--- a/hardware/kicad/lib/SIMtrace.mod
+++ b/hardware/kicad/lib/SIMtrace.mod
@@ -1,8 +1,9 @@
-PCBNEW-LibModule-V1  Mo 20 Dez 2010 13:05:41 CET
+PCBNEW-LibModule-V1  Di 10 Mai 2011 17:13:33 CEST
 $INDEX
 CAP_AVE_E
 SC_ID0
 SC_ID000
+SOD123
 $EndINDEX
 $MODULE CAP_AVE_E
 Po 0 0 0 15 4CFCEE9A 00000000 ~~
@@ -163,7 +164,7 @@ $MODULE SC_ID000
 Po 0 0 0 15 4D0F4692 00000000 ~~
 Li SC_ID000
 Sc 00000000
-AR 
+AR
 Op 0 0 0
 T0 0 -1181 600 600 0 120 N V 21 N"SC_ID000"
 T1 0 1181 600 600 0 120 N V 21 N"VAL**"
@@ -244,4 +245,27 @@ Ne 0 ""
 Po 3161 5344
 $EndPAD
 $EndMODULE  SC_ID000
+$MODULE SOD123
+Po 0 0 0 15 4DC95616 00000000 ~~
+Li SOD123
+Sc 00000000
+AR 
+Op 0 0 0
+T0 0 1000 600 600 0 120 N V 21 N"SOD123"
+T1 0 -1000 600 600 0 120 N V 21 N"VAL**"
+$PAD
+Sh "2" R 358 480 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 645 0
+$EndPAD
+$PAD
+Sh "1" R 358 480 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -645 0
+$EndPAD
+$EndMODULE  SOD123
 $EndLIBRARY