diff --git a/main/Qi_AVT2.cache.bck b/main/Qi_AVT2.cache.bck
index f30d6f8..d49f2a1 100755
--- a/main/Qi_AVT2.cache.bck
+++ b/main/Qi_AVT2.cache.bck
@@ -1,3 +1,3 @@
-EESchema-DOCLIB  Version 2.0  4/9/2009-06:49:46
+EESchema-DOCLIB  Version 2.0  13/9/2009-03:03:10
 #
 #End Doc Library
diff --git a/main/Qi_AVT2.cache.lib b/main/Qi_AVT2.cache.lib
index 4857606..e53fd2b 100755
--- a/main/Qi_AVT2.cache.lib
+++ b/main/Qi_AVT2.cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version  4/9/2009-06:49:46
+EESchema-LIBRARY Version  13/9/2009-03:03:10
 #
 #
 # BAT_CON
@@ -67,8 +67,8 @@ $FPLIST
  C1-1
 $ENDFPLIST
 DRAW
-P 2 0 1 8  -100 -30  100 -30 N
 P 2 0 1 8  -100 30  100 30 N
+P 2 0 1 8  -100 -30  100 -30 N
 X ~ 1 0 200 170 D 40 40 1 1 P
 X ~ 2 0 -200 170 U 40 40 1 1 P
 ENDDRAW
@@ -80,14 +80,14 @@ DEF CPOLARIZED C 0 40 N N 1 F N
 F0 "C" 50 150 60 H V C C
 F1 "CPOLARIZED" -50 -100 60 H V C C
 DRAW
-P 2 0 1 10  -100 -50  -110 -50 N
-P 3 0 1 10  -70 85  -70 80  -70 80 N
-P 3 0 1 10  -100 105  -40 105  -40 105 N
-P 2 0 1 0  0 -50  0 -150 N
-P 3 0 1 30  -100 50  100 50  100 50 N
-P 4 0 1 10  -100 -50  100 -50  100 -50  100 -50 N
-P 3 0 1 10  -70 135  -70 85  -70 85 N
 P 2 0 1 10  105 -50  110 -50 N
+P 3 0 1 10  -70 135  -70 85  -70 85 N
+P 4 0 1 10  -100 -50  100 -50  100 -50  100 -50 N
+P 3 0 1 30  -100 50  100 50  100 50 N
+P 2 0 1 0  0 -50  0 -150 N
+P 3 0 1 10  -100 105  -40 105  -40 105 N
+P 3 0 1 10  -70 85  -70 80  -70 80 N
+P 2 0 1 10  -100 -50  -110 -50 N
 X + 1 0 250 200 D 50 50 1 1 I
 X - 2 0 -250 200 U 50 50 1 1 I
 ENDDRAW
@@ -100,8 +100,8 @@ F0 "X" 0 150 60 H V C C
 F1 "CRYSTAL" 0 -150 60 H V C C
 DRAW
 P 5 0 1 12  -50 50  50 50  50 -50  -50 -50  -50 50 f
-P 2 0 1 16  100 100  100 -100 N
 P 2 0 1 16  -100 100  -100 -100 N
+P 2 0 1 16  100 100  100 -100 N
 X 2 2 300 0 200 L 40 40 1 1 P
 X 1 1 -300 0 200 R 40 40 1 1 P
 ENDDRAW
@@ -186,6 +186,16 @@ X GND 1 0 0 0 U 30 30 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# HD
+#
+DEF HD H 0 40 Y Y 1 F N
+F0 "H" 0 0 60 H V C C
+F1 "HD" 0 150 60 H V C C
+DRAW
+C 0 0 100 0 1 0 N
+ENDDRAW
+ENDDEF
+#
 # HY27UG088G5M
 #
 DEF HY27UG088G5M U 0 40 Y Y 1 F N
@@ -250,10 +260,10 @@ DEF INDUCTOR L 0 40 N N 0 F N
 F0 "L" -50 0 40 V V C C
 F1 "INDUCTOR" 100 0 40 V V C C
 DRAW
-A 0 148 48 -889 889 0 1 0 N 1 101 1 196
-A 0 51 51 -889 889 0 1 0 N 1 1 1 102
-A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
 A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
+A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
+A 0 51 51 -889 889 0 1 0 N 1 1 1 102
+A 0 148 48 -889 889 0 1 0 N 1 101 1 196
 X 1 1 0 300 100 D 70 70 1 1 P
 X 2 2 0 -300 100 U 70 70 1 1 P
 ENDDRAW
@@ -265,12 +275,12 @@ DEF INDUCTORP L 0 40 N N 1 F N
 F0 "L" 250 50 40 V V C C
 F1 "INDUCTORP" -100 0 40 V V C C
 DRAW
-P 2 0 1 0  150 200  150 -200 N
-A 0 148 48 -889 889 0 1 0 N 1 101 1 196
-A 0 51 51 -889 889 0 1 0 N 1 1 1 102
-A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
-A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
 P 3 0 1 0  100 200  100 -200  100 -200 N
+A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
+A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
+A 0 51 51 -889 889 0 1 0 N 1 1 1 102
+A 0 148 48 -889 889 0 1 0 N 1 101 1 196
+P 2 0 1 0  150 200  150 -200 N
 X 1 1 0 300 100 D 70 70 1 1 P
 X 2 2 0 -300 100 U 70 70 1 1 P
 ENDDRAW
@@ -479,9 +489,9 @@ F0 "D" 0 100 50 H V C C
 F1 "LED" 0 -100 50 H V C C
 DRAW
 P 3 0 1 0  -50 50  50 0  -50 -50 F
-P 3 0 1 0  65 -40  110 -80  105 -55 N
-P 3 0 1 0  80 -25  125 -65  120 -40 N
 P 2 0 1 0  50 50  50 -50 N
+P 3 0 1 0  80 -25  125 -65  120 -40 N
+P 3 0 1 0  65 -40  110 -80  105 -55 N
 X K 2 200 0 150 L 40 40 1 1 P
 X A 1 -200 0 150 R 40 40 1 1 P
 ENDDRAW
@@ -532,10 +542,10 @@ DEF NPN Q 0 0 Y Y 0 F N
 F0 "Q" 150 0 50 H V C C
 F1 "NPN" -98 150 50 H V C C
 DRAW
-P 5 0 1 0  50 -100  100 -100  100 -50  50 -100  50 -100 N
-P 2 0 1 0  0 0  75 -75 N
-P 2 0 1 0  0 0  100 100 N
 P 2 0 1 8  0 100  0 -100 N
+P 2 0 1 0  0 0  100 100 N
+P 2 0 1 0  0 0  75 -75 N
+P 5 0 1 0  50 -100  100 -100  100 -50  50 -100  50 -100 N
 X C 3 100 200 100 D 40 40 1 1 P
 X B 2 -200 0 200 R 40 40 1 1 I
 X E 1 100 -200 100 U 40 40 1 1 P
@@ -616,15 +626,15 @@ P 4 0 1 0  -80 0  -110 30  -50 30  -50 30 F
 P 3 0 1 0  -80 50  -80 0  -80 0 F
 P 4 0 1 0  -200 50  -80 50  -80 50  -80 50 F
 P 5 0 1 0  -80 150  -110 120  -50 120  -80 150  -70 140 F
-P 3 0 1 0  -200 -50  -220 -50  -220 -50 N
-P 3 0 1 0  -200 50  -220 50  -220 50 N
-P 3 0 1 0  -200 150  -220 150  -220 150 N
-P 5 0 1 0  -200 0  -10 0  50 40  110 0  110 0 N
-P 4 0 1 0  -200 100  -80 100  -80 150  -90 150 N
-P 6 0 1 0  -200 -50  250 -50  250 150  200 150  200 -50  200 -50 N
-P 5 0 1 0  -200 150  50 150  100 110  150 150  150 150 N
-P 3 0 1 0  -200 100  -220 100  -220 100 N
 P 3 0 1 0  -200 0  -220 0  -220 0 N
+P 3 0 1 0  -200 100  -220 100  -220 100 N
+P 5 0 1 0  -200 150  50 150  100 110  150 150  150 150 N
+P 6 0 1 0  -200 -50  250 -50  250 150  200 150  200 -50  200 -50 N
+P 4 0 1 0  -200 100  -80 100  -80 150  -90 150 N
+P 5 0 1 0  -200 0  -10 0  50 40  110 0  110 0 N
+P 3 0 1 0  -200 150  -220 150  -220 150 N
+P 3 0 1 0  -200 50  -220 50  -220 50 N
+P 3 0 1 0  -200 -50  -220 -50  -220 -50 N
 X 1 1 -250 -50 30 R 30 30 1 1 P
 X 3 3 -250 0 30 R 30 30 1 1 I
 X 4 4 -250 50 30 R 30 30 1 1 P
@@ -668,11 +678,11 @@ DEF R_PACK4 RP 0 20 Y N 1 F N
 F0 "RP" 0 450 40 H V C C
 F1 "R_PACK4" 0 -50 40 H V C C
 DRAW
-P 5 0 1 0  -100 400  -100 0  100 0  100 400  -100 400 N
-P 7 0 1 0  -100 50  -80 70  -40 30  0 70  40 30  80 70  100 50 N
-P 7 0 1 0  -100 150  -80 170  -40 130  0 170  40 130  80 170  100 150 N
-P 7 0 1 0  -100 250  -80 270  -40 230  0 270  40 230  80 270  100 250 N
 P 7 0 1 0  -100 350  -80 370  -40 330  0 370  40 330  80 370  100 350 N
+P 7 0 1 0  -100 250  -80 270  -40 230  0 270  40 230  80 270  100 250 N
+P 7 0 1 0  -100 150  -80 170  -40 130  0 170  40 130  80 170  100 150 N
+P 7 0 1 0  -100 50  -80 70  -40 30  0 70  40 30  80 70  100 50 N
+P 5 0 1 0  -100 400  -100 0  100 0  100 400  -100 400 N
 X R4 5 200 50 100 L 40 40 1 1 P
 X R3 6 200 150 100 L 40 40 1 1 P
 X R2 7 200 250 100 L 40 40 1 1 P
@@ -708,14 +718,14 @@ DEF SDCW2012 L 0 40 Y N 1 F N
 F0 "L" -50 200 60 H V C C
 F1 "SDCW2012" 0 -100 60 H V C C
 DRAW
-A 25 -50 25 1 1799 0 1 0 N 50 -50 0 -50
-A -75 -50 25 1 1799 0 1 0 N -50 -50 -100 -50
-P 3 0 1 0  -100 50  50 50  50 50 N
-A -25 100 25 -1799 -1 0 1 0 N -50 100 0 100
-A -75 100 25 -1799 -1 0 1 0 N -100 100 -50 100
-A 25 100 25 -1799 -1 0 1 0 N 0 100 50 100
-P 3 0 1 0  -100 0  50 0  50 0 N
 A -25 -50 25 1 1799 0 1 0 N 0 -50 -50 -50
+P 3 0 1 0  -100 0  50 0  50 0 N
+A 25 100 25 -1799 -1 0 1 0 N 0 100 50 100
+A -75 100 25 -1799 -1 0 1 0 N -100 100 -50 100
+A -25 100 25 -1799 -1 0 1 0 N -50 100 0 100
+P 3 0 1 0  -100 50  50 50  50 50 N
+A -75 -50 25 1 1799 0 1 0 N -50 -50 -100 -50
+A 25 -50 25 1 1799 0 1 0 N 50 -50 0 -50
 X 4 4 100 -50 50 L 30 30 1 1 I
 X 3 3 100 100 50 L 30 30 1 1 I
 X 2 2 -150 -50 50 R 30 30 1 1 I
@@ -760,8 +770,8 @@ DEF ~SOLDERPASTE SP 0 40 N N 1 F N
 F0 "SP" 0 0 60 H V C C
 F1 "SOLDERPASTE" 0 0 60 H I C C
 DRAW
-C 0 80 22 0 1 0 N
 S -30 110 30 50 0 1 0 N
+C 0 80 22 0 1 0 N
 X 1 1 0 -50 100 U 50 50 1 1 B
 ENDDRAW
 ENDDEF
@@ -790,23 +800,40 @@ DEF ~SW_METALDOMN S 0 40 N N 1 F N
 F0 "S" 0 100 60 H V C C
 F1 "SW_METALDOMN" 0 -50 60 H I C C
 DRAW
-P 6 0 1 0  -80 45  -65 65  60 65  75 45  75 45  75 45 N
-C 90 0 10 0 1 0 N
-C -90 0 10 0 1 0 N
 S -100 20 100 40 0 1 0 N
+C -90 0 10 0 1 0 N
+C 90 0 10 0 1 0 N
+P 6 0 1 0  -80 45  -65 65  60 65  75 45  75 45  75 45 N
 X 1 1 200 0 100 L 50 50 1 1 P
 X 2 2 -200 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# SWITCH
+#
+DEF SWITCH SW 0 40 Y Y 1 F N
+F0 "SW" 0 -250 60 H V C C
+F1 "SWITCH" 0 250 60 H V C C
+$FPLIST
+ SWITCH
+ SW
+$ENDFPLIST
+DRAW
+S 150 -200 -150 200 0 1 0 N
+X 1 1 -450 -100 300 R 50 50 1 1 I
+X 3 3 -450 0 300 R 50 50 1 1 I
+X 2 2 -450 100 300 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # TESTPOINT
 #
 DEF ~TESTPOINT TP 0 40 N N 1 F N
 F0 "TP" 0 0 30 H V C C
 F1 "TESTPOINT" 0 0 60 H I C C
 DRAW
-C 0 80 22 0 1 0 N
 S -30 110 30 50 0 1 0 N
+C 0 80 22 0 1 0 N
 X 1 1 0 -50 100 U 30 30 1 1 B
 ENDDRAW
 ENDDEF
@@ -823,16 +850,16 @@ P 3 0 0 10  -150 -25  -150 -75  -150 -75 F
 P 2 0 0 10  -150 100  -150 125 F
 P 8 0 0 10  100 75  50 0  150 0  100 75  50 75  50 75  150 75  150 75 F
 P 7 0 0 10  0 25  -50 50  -50 0  0 25  0 25  0 100  0 100 F
-P 3 0 0 10  100 0  100 -50  100 -50 N
-P 3 0 0 10  -100 -50  0 -50  0 -50 N
-P 3 0 0 10  -100 50  -100 0  -100 0 N
-P 3 0 0 10  -100 125  -100 75  -100 75 N
-P 3 0 0 10  -100 100  0 100  0 100 N
-P 3 0 0 10  -100 25  0 25  0 25 N
-P 3 0 0 10  -100 -25  -100 -75  -100 -75 N
-P 3 0 0 10  -150 100  -150 -25  -150 -25 N
-P 3 0 0 10  100 75  100 100  100 100 N
 P 3 0 1 10  -150 125  -150 150  -150 150 N
+P 3 0 0 10  100 75  100 100  100 100 N
+P 3 0 0 10  -150 100  -150 -25  -150 -25 N
+P 3 0 0 10  -100 -25  -100 -75  -100 -75 N
+P 3 0 0 10  -100 25  0 25  0 25 N
+P 3 0 0 10  -100 100  0 100  0 100 N
+P 3 0 0 10  -100 125  -100 75  -100 75 N
+P 3 0 0 10  -100 50  -100 0  -100 0 N
+P 3 0 0 10  -100 -50  0 -50  0 -50 N
+P 3 0 0 10  100 0  100 -50  100 -50 N
 T 0 -200 50 60 0 0 0 G
 T 0 50 -100 60 0 0 0 D
 T 0 50 150 60 0 0 0 S
@@ -852,23 +879,23 @@ P 2 0 0 10  -100 50  -100 75 F
 P 2 0 0 10  -100 -25  -100 -100 F
 P 6 0 0 10  -50 0  0 25  0 -25  -50 0  0 0  0 0 F
 P 5 0 0 0  150 50  100 -25  175 -25  200 -25  150 50 F
-P 3 0 1 0  50 100  50 75  50 75 N
-P 3 0 1 0  50 -100  50 -100  50 -100 N
-P 2 0 0 0  75 75  100 75 N
-P 3 0 0 0  50 -75  75 -75  75 -75 N
-P 2 0 0 10  150 -25  150 -50 N
-P 3 0 0 10  100 50  200 50  200 50 N
-P 2 0 0 10  -50 -75  50 -75 N
-P 3 0 0 10  -50 75  50 75  50 75 N
-P 2 0 0 10  -100 -25  -100 50 N
-P 4 0 0 10  -50 50  -50 75  -50 100  -50 100 N
-P 3 0 0 10  -50 25  -50 -25  -50 -25 N
-P 2 0 0 10  -50 -50  -50 -100 N
-P 3 0 0 10  150 50  150 75  150 75 N
-P 3 0 0 10  0 0  50 0  50 -75 N
-P 3 0 0 0  50 75  75 75  75 75 N
-P 2 0 0 0  75 -75  100 -75 N
 P 3 0 1 0  50 -100  50 -50  50 -50 N
+P 2 0 0 0  75 -75  100 -75 N
+P 3 0 0 0  50 75  75 75  75 75 N
+P 3 0 0 10  0 0  50 0  50 -75 N
+P 3 0 0 10  150 50  150 75  150 75 N
+P 2 0 0 10  -50 -50  -50 -100 N
+P 3 0 0 10  -50 25  -50 -25  -50 -25 N
+P 4 0 0 10  -50 50  -50 75  -50 100  -50 100 N
+P 2 0 0 10  -100 -25  -100 50 N
+P 3 0 0 10  -50 75  50 75  50 75 N
+P 2 0 0 10  -50 -75  50 -75 N
+P 3 0 0 10  100 50  200 50  200 50 N
+P 2 0 0 10  150 -25  150 -50 N
+P 3 0 0 0  50 -75  75 -75  75 -75 N
+P 2 0 0 0  75 75  100 75 N
+P 3 0 1 0  50 -100  50 -100  50 -100 N
+P 3 0 1 0  50 100  50 75  50 75 N
 T 0 -150 -140 60 0 0 0 G
 T 0 90 -125 60 0 0 0 S
 T 0 85 125 60 0 0 0 D
@@ -920,8 +947,8 @@ DEF V18 #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -50 20 H I C C
 F1 "V18" 0 100 30 H V C C
 DRAW
-C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
+C 0 60 20 0 1 0 N
 X +BATT 1 0 0 0 U 20 20 0 0 W N
 ENDDRAW
 ENDDEF
@@ -932,8 +959,8 @@ DEF V33 #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -50 20 H I C C
 F1 "V33" 0 100 30 H V C C
 DRAW
-C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
+C 0 60 20 0 1 0 N
 X +BATT 1 0 0 0 U 20 20 0 0 W N
 ENDDRAW
 ENDDEF
@@ -944,8 +971,8 @@ DEF V33SD #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -50 20 H I C C
 F1 "V33SD" 0 100 30 H V C C
 DRAW
-P 3 0 1 0  0 0  0 40  0 40 N
 C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
 X +BATT 1 0 0 0 U 20 20 0 0 W N
 ENDDRAW
 ENDDEF
@@ -956,8 +983,8 @@ DEF VBAT #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -50 20 H I C C
 F1 "VBAT" 0 100 30 H V C C
 DRAW
-C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
+C 0 60 20 0 1 0 N
 X +BATT 1 0 0 0 U 20 20 0 0 W N
 ENDDRAW
 ENDDEF
@@ -968,8 +995,8 @@ DEF VBATO #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -50 20 H I C C
 F1 "VBATO" 0 100 30 H V C C
 DRAW
-C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
+C 0 60 20 0 1 0 N
 X +BATT 1 0 0 0 U 20 20 0 0 W N
 ENDDRAW
 ENDDEF
@@ -980,8 +1007,8 @@ DEF VBUS #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -50 20 H I C C
 F1 "VBUS" 0 100 30 H V C C
 DRAW
-C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
+C 0 60 20 0 1 0 N
 X +BATT 1 0 0 0 U 20 20 0 0 W N
 ENDDRAW
 ENDDEF
@@ -992,8 +1019,8 @@ DEF VDDHP #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -50 20 H I C C
 F1 "VDDHP" 0 100 30 H V C C
 DRAW
-P 3 0 1 0  0 0  0 40  0 40 N
 C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
 X +BATT 1 0 0 0 U 20 20 0 0 W N
 ENDDRAW
 ENDDEF
@@ -1004,8 +1031,8 @@ DEF VRTC #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -50 20 H I C C
 F1 "VRTC" 0 100 30 H V C C
 DRAW
-C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
+C 0 60 20 0 1 0 N
 X +BATT 1 0 0 0 U 20 20 0 0 W N
 ENDDRAW
 ENDDEF
diff --git a/main/Qi_AVT2.cmp b/main/Qi_AVT2.cmp
index 16a410c..a87d56b 100755
--- a/main/Qi_AVT2.cmp
+++ b/main/Qi_AVT2.cmp
@@ -1,4 +1,4 @@
-Cmp-Mod V01 Created by CVpcb (20080825c) date = 5/9/2009-00:20:37
+Cmp-Mod V01 Created by CVpcb (20080825c) date = 13/9/2009-03:10:07
 
 BeginCmp
 TimeStamp = /4A477662;
@@ -637,6 +637,41 @@ ValeurCmp = MSCD104;
 IdModule  = D0805;
 EndCmp
 
+BeginCmp
+TimeStamp = /4AABD9A9;
+Reference = H1;
+ValeurCmp = HD;
+IdModule  = M35NN;
+EndCmp
+
+BeginCmp
+TimeStamp = /4AABD9B8;
+Reference = H2;
+ValeurCmp = HD;
+IdModule  = M35NN;
+EndCmp
+
+BeginCmp
+TimeStamp = /4AABD9BB;
+Reference = H3;
+ValeurCmp = HD;
+IdModule  = M01_15;
+EndCmp
+
+BeginCmp
+TimeStamp = /4AABD9BE;
+Reference = H4;
+ValeurCmp = HD;
+IdModule  = M01_15;
+EndCmp
+
+BeginCmp
+TimeStamp = /4AABD9C0;
+Reference = H5;
+ValeurCmp = HD;
+IdModule  = M01_15;
+EndCmp
+
 BeginCmp
 TimeStamp = /4A4779DA/4A48012D;
 Reference = J1;
@@ -1554,6 +1589,13 @@ ValeurCmp = SOLDERPASTE;
 IdModule  = TP66R;
 EndCmp
 
+BeginCmp
+TimeStamp = /4AABC76A;
+Reference = SW1;
+ValeurCmp = BOOT_SWITCH;
+IdModule  = ESP_3P;
+EndCmp
+
 BeginCmp
 TimeStamp = /4A477446;
 Reference = TP1;
@@ -1624,83 +1666,6 @@ ValeurCmp = TESTPOINT;
 IdModule  = TPS40;
 EndCmp
 
-BeginCmp
-TimeStamp = /4A4779DA/4A47FB6C;
-Reference = TP11;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBB1;
-Reference = TP12;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBB8;
-Reference = TP13;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBB9;
-Reference = TP14;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBC7;
-Reference = TP15;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBC8;
-Reference = TP16;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBE2;
-Reference = TP17;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBE3;
-Reference = TP18;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBE5;
-Reference = TP19;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBE6;
-Reference = TP20;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBE7;
-Reference = TP21;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
 BeginCmp
 TimeStamp = /4A4779DA/4A4783D4;
 Reference = TP23;
@@ -1708,13 +1673,6 @@ ValeurCmp = TESTPOINT;
 IdModule  = TP40x20;
 EndCmp
 
-BeginCmp
-TimeStamp = /4A46EDD2/4A4631B5;
-Reference = TP24;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
 BeginCmp
 TimeStamp = /4A4779DA/4A4782DD;
 Reference = TP25;
@@ -1722,48 +1680,6 @@ ValeurCmp = TESTPOINT;
 IdModule  = TPS40;
 EndCmp
 
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBEF;
-Reference = TP26;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBF0;
-Reference = TP27;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBF1;
-Reference = TP28;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBF2;
-Reference = TP29;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBF3;
-Reference = TP30;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A47FBF4;
-Reference = TP31;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
 BeginCmp
 TimeStamp = /4A438A93;
 Reference = TP32;
@@ -1792,188 +1708,6 @@ ValeurCmp = TESTPOINT;
 IdModule  = TP40x20;
 EndCmp
 
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBB1;
-Reference = TP39;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBB8;
-Reference = TP40;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBB9;
-Reference = TP41;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBC7;
-Reference = TP42;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBEF;
-Reference = TP43;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBF0;
-Reference = TP44;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBF1;
-Reference = TP45;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBF2;
-Reference = TP46;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBF3;
-Reference = TP47;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBF4;
-Reference = TP48;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBE2;
-Reference = TP49;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBE3;
-Reference = TP50;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBE5;
-Reference = TP51;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A47FBE6;
-Reference = TP52;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46EDD2/4A46D860;
-Reference = TP53;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46EDD2/4A46D868;
-Reference = TP54;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46EDD2/4A46D869;
-Reference = TP55;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46EDD2/4A46D870;
-Reference = TP56;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46EDD2/4A46D871;
-Reference = TP57;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46EDD2/4A46D872;
-Reference = TP58;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A4631B5;
-Reference = TP59;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A46328B;
-Reference = TP60;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A463291;
-Reference = TP61;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A463292;
-Reference = TP62;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A46329A;
-Reference = TP63;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A46329B;
-Reference = TP64;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
 BeginCmp
 TimeStamp = /4A46ED00/4A46329C;
 Reference = TP65;
@@ -1981,27 +1715,6 @@ ValeurCmp = TESTPOINT;
 IdModule  = TPS40;
 EndCmp
 
-BeginCmp
-TimeStamp = /4A46ED00/4A46329D;
-Reference = TP66;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A4632A4;
-Reference = TP67;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A4632A5;
-Reference = TP68;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
 BeginCmp
 TimeStamp = /4A46ED00/4A4632A6;
 Reference = TP69;
@@ -2009,48 +1722,6 @@ ValeurCmp = TESTPOINT;
 IdModule  = TPS40;
 EndCmp
 
-BeginCmp
-TimeStamp = /4A46ED00/4A4632A7;
-Reference = TP70;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A4632A8;
-Reference = TP71;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A4632A9;
-Reference = TP72;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A4632AA;
-Reference = TP73;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A46ED00/4A4632AB;
-Reference = TP74;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A7F8308;
-Reference = TP75;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
 BeginCmp
 TimeStamp = /4A438B3F;
 Reference = TP76;
@@ -2072,55 +1743,6 @@ ValeurCmp = TESTPOINT;
 IdModule  = TPS40;
 EndCmp
 
-BeginCmp
-TimeStamp = /4A481D3C/4A47FB6C;
-Reference = TP79;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A4779DA/4A7F6EE5;
-Reference = TP80;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A6C6E3C;
-Reference = TP81;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A6C6E45;
-Reference = TP82;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A7F79C9;
-Reference = TP83;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A7F79CA;
-Reference = TP84;
-ValeurCmp = TESTPOINT;
-IdModule  = TP40x20;
-EndCmp
-
-BeginCmp
-TimeStamp = /4A481D3C/4A837BD1;
-Reference = TP85;
-ValeurCmp = TESTPOINT;
-IdModule  = TPS40;
-EndCmp
-
 BeginCmp
 TimeStamp = /4A4747A9;
 Reference = U1;
diff --git a/main/Qi_AVT2.net b/main/Qi_AVT2.net
index a499e19..145c9a8 100755
--- a/main/Qi_AVT2.net
+++ b/main/Qi_AVT2.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  5/9/2009-00:20:37
+# EESchema Netlist Version 1.1 created  13/9/2009-03:10:07
 (
  ( /4A477662 L0603 BD2 PZ1608D221
   ( 1 +BATT )
@@ -14,23 +14,23 @@
  )
  ( /4A481D3C/4A48284F L0603 BD6 PZ1608D221
   ( 1 +BATT )
-  ( 2 N-000187 )
+  ( 2 N-000194 )
  )
  ( /4A481D3C/4A482731 L0603 BD7 PZ1608D221
   ( 1 GND )
-  ( 2 N-000188 )
+  ( 2 N-000195 )
  )
  ( /4A46EDD2/4A46E548 L0603 BD8 PZ1608D221
   ( 1 /AUDIO/HPGND )
   ( 2 GND )
  )
  ( /4A46EDD2/4A46DD80 L0603 BD9 PZ1608D221
-  ( 1 N-000058 )
+  ( 1 N-000064 )
   ( 2 +BATT )
  )
  ( /4A481D3C/4A7BDB67 L0603 BD10 PZ1608D221
   ( 1 GND )
-  ( 2 N-000174 )
+  ( 2 N-000181 )
  )
  ( /4A481D3C/4A482E22 RP4 BN1 33/5%
   ( 1 /LCD_USB/LCD7 )
@@ -84,10 +84,10 @@
  )
  ( /4A41ABF2 C0402 C7 10pF/16V
   ( 1 +BATT )
-  ( 2 N-000012 )
+  ( 2 N-000021 )
  )
  ( /4A476F4D C0603 C8 33pF/16V
-  ( 1 N-000020 )
+  ( 1 N-000011 )
   ( 2 GND )
  )
  ( /4A41A1FB C0805 C9 10uF/10V
@@ -96,7 +96,7 @@
  )
  ( /4A41A880 C0402 C10 10pF/16V
   ( 1 +BATT )
-  ( 2 N-000014 )
+  ( 2 N-000019 )
  )
  ( /4A41A886 C0805 C11 10uF/10V
   ( 1 +BATT )
@@ -267,7 +267,7 @@
   ( 2 GND )
  )
  ( /4A481D3C/4A4825EA C0402 C54 0.1uF/16V
-  ( 1 N-000192 )
+  ( 1 N-000199 )
   ( 2 GND )
  )
  ( /4A481D3C/4A4825B1 C0402 C55 0.1uF/16V
@@ -280,11 +280,11 @@
  )
  ( /4A481D3C/4A4826C7 C0402 C58 0.1uF/16V
   ( 1 GND )
-  ( 2 N-000191 )
+  ( 2 N-000198 )
  )
  ( /4A46EDD2/4A46E9CC TCB3528 C59 100uF/4V
-  ( 1 /AUDIO/HPLO )
-  ( 2 N-000065 )
+  ( 1 N-000058 )
+  ( 2 N-000071 )
  )
  ( /4A46EDD2/4A46E174 TCB3528 C60 47uF/6.3V
   ( 1 /AUDIO/MICBIAS )
@@ -295,40 +295,40 @@
   ( 2 /AUDIO/MICBIAS )
  )
  ( /4A46EDD2/4A46EA0A TCB3528 C62 100uF/4V
-  ( 1 /AUDIO/HPRO )
-  ( 2 N-000053 )
+  ( 1 N-000072 )
+  ( 2 N-000059 )
  )
  ( /4A46EDD2/4A46E171 C0603 C63 1uF/16V
-  ( 1 N-000056 )
+  ( 1 N-000062 )
   ( 2 /AUDIO/MICIN )
  )
  ( /4A46EDD2/4A46DB7A TCB3528 C65 47uF/6.3V
-  ( 1 N-000058 )
+  ( 1 N-000064 )
   ( 2 GND )
  )
  ( /4A46EDD2/4A46DD12 C0402 C66 0.1uF/16V
   ( 1 GND )
-  ( 2 N-000058 )
+  ( 2 N-000064 )
  )
  ( /4A46EDD2/4A46DCB5 C0402 C67 0.1uF/16V
-  ( 1 N-000061 )
+  ( 1 N-000067 )
   ( 2 /AUDIO/AMPIN )
  )
  ( /4A46EDD2/4A46DB70 C0402 C68 0.1uF/16V
-  ( 1 N-000060 )
+  ( 1 N-000066 )
   ( 2 GND )
  )
  ( /4A41A30B C0402 C69 0.1uF/16V
-  ( 1 N-000015 )
+  ( 1 N-000017 )
   ( 2 GND )
  )
  ( /4A481D3C/4A4830BE C0402 C70 0.1uF/16V
-  ( 1 N-000200 )
+  ( 1 N-000207 )
   ( 2 +BATT )
  )
  ( /4A481D3C/4A7BDCBB R0402 C71 0.01uF/16V
   ( 1 GND )
-  ( 2 N-000203 )
+  ( 2 N-000210 )
  )
  ( /4A481D3C/4A7C10EC C0805 C72 10uF/10V
   ( 1 GND )
@@ -363,8 +363,8 @@
   ( 18 /LCD_USB/VSYNC )
   ( 19 /LCD_USB/HSYNC )
   ( 20 /LCD_USB/LCDCS )
-  ( 21 /LCD_USB/LCDSCL )
-  ( 22 /LCD_USB/LCDSDA )
+  ( 21 N-000102 )
+  ( 22 N-000101 )
   ( 23 GND )
   ( 24 GND )
   ( 25 GND )
@@ -376,7 +376,7 @@
   ( 3 /RXD )
  )
  ( /4A40EE54 D0805 D1 MSCD104
-  ( 1 N-000016 )
+  ( 1 N-000018 )
   ( 2 +BATT )
  )
  ( /4A40CCF7 D0805 D2 MSCD104
@@ -384,7 +384,7 @@
   ( 2 +BATT )
  )
  ( /4A409EE2 DIODE3 D3 RED_LED
-  ( 1 N-000026 )
+  ( 1 N-000005 )
   ( 2 N-000006 )
  )
  ( /4A40A66D D0805 D4 MSCD104
@@ -392,35 +392,45 @@
   ( 2 N-000006 )
  )
  ( /4A481D3C/4A7BDF6A D0805 D5 MSCD104
-  ( 1 N-000204 )
-  ( 2 N-000173 )
+  ( 1 N-000211 )
+  ( 2 N-000180 )
  )
  ( /4A481D3C/4A837C30 D0805 D6 MSCD104
-  ( 1 N-000168 )
+  ( 1 N-000174 )
   ( 2 /LCD_USB/VHOST )
  )
+ ( /4AABD9A9 M35NN H1 HD
+ )
+ ( /4AABD9B8 M35NN H2 HD
+ )
+ ( /4AABD9BB M01_15 H3 HD
+ )
+ ( /4AABD9BE M01_15 H4 HD
+ )
+ ( /4AABD9C0 M01_15 H5 HD
+ )
  ( /4A4779DA/4A48012D CON_MEM J1 MS_1D77
-  ( 1 /MEMORY/SDD2 )
-  ( 2 /MEMORY/SDD3 )
-  ( 3 /MEMORY/SDCMD )
+  ( 1 N-000137 )
+  ( 2 N-000095 )
+  ( 3 N-000138 )
   ( 4 +BATT )
-  ( 5 /MEMORY/SDCLK )
+  ( 5 ? )
   ( 6 GND )
-  ( 7 /MEMORY/SDD0 )
-  ( 8 /MEMORY/SDD1 )
+  ( 7 N-000094 )
+  ( 8 N-000139 )
   ( 9 GND )
-  ( 10 /MEMORY/SDDET )
+  ( 10 N-000093 )
   ( 11 GND )
  )
  ( /4A481D3C/4A4826AA CON_USB_MB J2 USB_MINIB
-  ( 1 N-000187 )
-  ( 2 N-000190 )
-  ( 3 N-000191 )
-  ( 4 N-000188 )
-  ( 5 N-000188 )
-  ( 6 N-000191 )
-  ( 7 N-000191 )
-  ( 9 N-000191 )
+  ( 1 N-000194 )
+  ( 2 N-000197 )
+  ( 3 N-000198 )
+  ( 4 N-000195 )
+  ( 5 N-000195 )
+  ( 6 N-000198 )
+  ( 7 N-000198 )
+  ( 9 N-000198 )
  )
  ( /4A46EDD2/4A46E402 AUDIO_JACK J3 PHONEJACK
   ( 1 /AUDIO/HPGND )
@@ -430,40 +440,40 @@
   ( 5 /AUDIO/AMPIN )
  )
  ( /4A481D3C/4A7BD8B4 CON_USB_A J4 USB_MICRO_AB
-  ( 1 N-000173 )
-  ( 2 N-000207 )
-  ( 3 N-000172 )
-  ( 4 N-000137 )
-  ( 5 N-000174 )
-  ( 6 N-000203 )
-  ( 7 N-000203 )
+  ( 1 N-000180 )
+  ( 2 N-000214 )
+  ( 3 N-000179 )
+  ( 4 N-000143 )
+  ( 5 N-000181 )
+  ( 6 N-000210 )
+  ( 7 N-000210 )
  )
  ( /4A41ABF1 L1L4 L1 4.7uH/1A
-  ( 1 N-000013 )
+  ( 1 N-000020 )
   ( 2 +BATT )
  )
  ( /4A41A6DA L1L4 L2 4.7uH/1A
-  ( 1 N-000017 )
+  ( 1 N-000016 )
   ( 2 +BATT )
  )
  ( /4A481D3C/4A48278C L3L5 L3 SDCW2012-2-900
-  ( 1 N-000190 )
-  ( 2 N-000196 )
+  ( 1 N-000197 )
+  ( 2 N-000203 )
   ( 3 /LCD_USB/DN )
   ( 4 /LCD_USB/DP )
  )
  ( /4A481D3C/4A7C101A L1L4 L4 4.7uH/1A
   ( 1 +BATT )
-  ( 2 N-000168 )
+  ( 2 N-000174 )
  )
  ( /4A481D3C/4A7BE3CC L3L5 L5 SDCW2012-2-900
-  ( 1 N-000207 )
-  ( 2 N-000172 )
+  ( 1 N-000214 )
+  ( 2 N-000179 )
   ( 3 /LCD_USB1 )
   ( 4 /LCD_USB2 )
  )
  ( /4A46EDD2/4A46E136 TP66R MIC+1 SOLDERPASTE
-  ( 1 N-000056 )
+  ( 1 N-000062 )
  )
  ( /4A46EDD2/4A46E14A TP66R MIC-1 SOLDERPASTE
   ( 1 GND )
@@ -481,37 +491,37 @@
  ( /4A403664 SOT23 Q3 TM2302N
   ( 1 /PW_ON_N )
   ( 2 GND )
-  ( 3 N-000004 )
+  ( 3 N-000025 )
  )
  ( /4A4779DA/4A47FF82 SOT23 Q4 TM2301N
-  ( 1 /MEMORY/SDPWEN )
+  ( 1 N-000097 )
   ( 2 +BATT )
   ( 3 +BATT )
  )
  ( /4A481D3C/4A482A1C SOT23 Q5 2N3904
   ( 1 GND )
-  ( 2 N-000167 )
-  ( 3 /LCD_USB/USBDET )
+  ( 2 N-000173 )
+  ( 3 N-000100 )
  )
  ( /4A46EDD2/4A46DF25 SOT23 Q6 TM2301N
   ( 1 /AUDIO/AMPIN )
-  ( 2 /AUDIO/AMPEN )
-  ( 3 N-000057 )
+  ( 2 N-000068 )
+  ( 3 N-000063 )
  )
  ( /4A46EDD2/4A46E82E SOT23 Q9 TM2302N
-  ( 1 /AUDIO/POP )
-  ( 2 N-000054 )
-  ( 3 N-000065 )
+  ( 1 /MEMORY/POP )
+  ( 2 N-000060 )
+  ( 3 N-000071 )
  )
  ( /4A46EDD2/4A46E868 SOT23 Q10 TM2302N
-  ( 1 /AUDIO/POP )
-  ( 2 N-000063 )
-  ( 3 N-000053 )
+  ( 1 /MEMORY/POP )
+  ( 2 N-000069 )
+  ( 3 N-000059 )
  )
  ( /4A481D3C/4A7BDFFD SOT23 Q11 TM2301N
-  ( 1 N-000137 )
+  ( 1 N-000143 )
   ( 2 /LCD_USB/VHOST )
-  ( 3 N-000204 )
+  ( 3 N-000211 )
  )
  ( /4A476D5E R0603 R1 1M/5%
   ( 1 /RCLK )
@@ -519,11 +529,11 @@
  )
  ( /4A476D68 R0402 R2 1M/5%
   ( 1 /XTAL )
-  ( 2 N-000020 )
+  ( 2 N-000011 )
  )
  ( /4A41ABF5 R0603 R3 680K/1%
   ( 1 +BATT )
-  ( 2 N-000012 )
+  ( 2 N-000021 )
  )
  ( /4A4774BC R0603 R4 10K/5%
   ( 1 +BATT )
@@ -531,46 +541,46 @@
  )
  ( /4A4774D0 R0603 R5 10K/5%
   ( 1 +BATT )
-  ( 2 /BOOT_SEL1 )
+  ( 2 /BOOT_SEL1_HIGH )
  )
  ( /4A41ABF6 R0603 R6 150K/1%
-  ( 1 N-000012 )
+  ( 1 N-000021 )
   ( 2 GND )
  )
  ( /4A4774E2 R0603 R7 10K/5%
   ( 1 +BATT )
-  ( 2 N-000025 )
+  ( 2 N-000003 )
  )
  ( /4A476E30 R0402 R8 330/5%
   ( 1 /EXTAL )
-  ( 2 N-000020 )
+  ( 2 N-000011 )
  )
  ( /4A4774D7 R0603 R9 0
-  ( 1 /BOOT_SEL1 )
+  ( 1 /BOOT_SEL1_HIGH )
   ( 2 GND )
  )
  ( /4A41A896 R0603 R10 300K/1%
   ( 1 +BATT )
-  ( 2 N-000014 )
+  ( 2 N-000019 )
  )
  ( /4A41A947 R0603 R11 150K/1%
-  ( 1 N-000014 )
+  ( 1 N-000019 )
   ( 2 GND )
  )
  ( /4A409E5B R0603 R12 510/5%
   ( 1 +BATT )
-  ( 2 N-000026 )
+  ( 2 N-000005 )
  )
  ( /4A439C70 R0603 R13 470K/5%
   ( 1 +BATT )
   ( 2 /RESETP_N )
  )
  ( /4A404BF9 R0603 R14 2.5K/5%
-  ( 1 N-000005 )
-  ( 2 N-000004 )
+  ( 1 N-000004 )
+  ( 2 N-000025 )
  )
  ( /4A40422D R0603 R15 10K/5%
-  ( 1 N-000005 )
+  ( 1 N-000004 )
   ( 2 GND )
  )
  ( /4A4492F8 R0402 R16 100K/5%
@@ -603,27 +613,27 @@
  )
  ( /4A4779DA/4A480143 R0603 R23 10K/5%
   ( 1 +BATT )
-  ( 2 /MEMORY/SDD1 )
+  ( 2 N-000139 )
  )
  ( /4A4779DA/4A48017F R0603 R24 10K/5%
   ( 1 +BATT )
-  ( 2 /MEMORY/SDD0 )
+  ( 2 N-000094 )
  )
  ( /4A4779DA/4A4801A3 R0603 R26 10K/5%
-  ( 1 /MEMORY/SDDET )
+  ( 1 N-000093 )
   ( 2 +BATT )
  )
  ( /4A4779DA/4A480193 R0603 R27 10K/5%
   ( 1 +BATT )
-  ( 2 /MEMORY/SDCMD )
+  ( 2 N-000138 )
  )
  ( /4A4779DA/4A480194 R0603 R28 10K/5%
   ( 1 +BATT )
-  ( 2 /MEMORY/SDD3 )
+  ( 2 N-000095 )
  )
  ( /4A4779DA/4A480197 R0603 R29 10K/5%
   ( 1 +BATT )
-  ( 2 /MEMORY/SDD2 )
+  ( 2 N-000137 )
  )
  ( /4A4779DA/4A4818A9 R0603 R30 10K/5%
   ( 1 /MEMORY/WP_N )
@@ -635,18 +645,18 @@
  )
  ( /4A481D3C/4A482569 R0603 R32 2.5K/5%
   ( 1 GND )
-  ( 2 N-000195 )
+  ( 2 N-000202 )
  )
  ( /4A481D3C/4A482941 R0603 R33 1K/5%
   ( 1 +BATT )
-  ( 2 N-000167 )
+  ( 2 N-000173 )
  )
  ( /4A481D3C/4A482970 R0603 R34 10K/5%
   ( 1 +BATT )
-  ( 2 /LCD_USB/USBDET )
+  ( 2 N-000100 )
  )
  ( /4A481D3C/4A482978 R0603 R35 1K/5%
-  ( 1 N-000167 )
+  ( 1 N-000173 )
   ( 2 GND )
  )
  ( /4A46EDD2/4A46E543 R0603 R36 100K/5%
@@ -655,58 +665,58 @@
  )
  ( /4A46EDD2/4A46E6C2 R0603 R37 33/5%
   ( 1 /AUDIO/HPOL )
-  ( 2 N-000054 )
+  ( 2 N-000060 )
  )
  ( /4A46EDD2/4A46E6D7 R0603 R38 33/5%
   ( 1 /AUDIO/HPOR )
-  ( 2 N-000063 )
+  ( 2 N-000069 )
  )
  ( /4A46EDD2/4A46E16E R0603 R39 22K/5%
   ( 1 /AUDIO/MICBIAS )
-  ( 2 N-000056 )
+  ( 2 N-000062 )
  )
  ( /4A46EDD2/4A46E906 R0603 R40 100/5%
   ( 1 GND )
-  ( 2 N-000065 )
+  ( 2 N-000071 )
  )
  ( /4A46EDD2/4A46E8DF R0603 R41 100/5%
   ( 1 GND )
-  ( 2 N-000053 )
+  ( 2 N-000059 )
  )
  ( /4A46EDD2/4A46DF0D R0603 R42 100K/5%
   ( 1 GND )
-  ( 2 N-000057 )
+  ( 2 N-000063 )
  )
  ( /4A481D3C/4A7BDD77 R0603 R43 100K/5%
-  ( 1 N-000203 )
+  ( 1 N-000210 )
   ( 2 GND )
  )
  ( /4A46EDD2/4A46DB8E R0603 R44 10K/5%
-  ( 1 N-000059 )
-  ( 2 N-000061 )
+  ( 1 N-000065 )
+  ( 2 N-000067 )
  )
  ( /4A481D3C/4A7BE0B1 R0603 R45 10K/5%
-  ( 1 N-000137 )
+  ( 1 N-000143 )
   ( 2 /LCD_USB/VHOST )
  )
  ( /4A41A383 R0603 R46 10K/5%
-  ( 1 N-000015 )
+  ( 1 N-000017 )
   ( 2 /PWEN )
  )
  ( /4A481D3C/4A4830AE R0603 R47 47K/5%
   ( 1 GND )
-  ( 2 N-000200 )
+  ( 2 N-000207 )
  )
  ( /4A481D3C/4A7C2400 R0402 R48 1M/5%
-  ( 1 N-000170 )
+  ( 1 N-000177 )
   ( 2 +BATT )
  )
  ( /4A481D3C/4A7C2342 R0603 R49 1M/5%
   ( 1 GND )
-  ( 2 N-000170 )
+  ( 2 N-000177 )
  )
  ( /4A481D3C/4A7C1D22 R0603 R50 1M/5%
-  ( 1 N-000171 )
+  ( 1 N-000178 )
   ( 2 +BATT )
  )
  ( /4A4493DC TPSR15 S1 RESETK
@@ -955,6 +965,11 @@
  ( /4A46EDD2/4A46D9F6 TP66R SP-1 SOLDERPASTE
   ( 1 /AUDIO/SP- )
  )
+ ( /4AABC76A ESP_3P SW1 BOOT_SWITCH
+  ( 1 GND )
+  ( 2 /BOOT_SEL1 )
+  ( 3 /BOOT_SEL1_HIGH )
+ )
  ( /4A477446 TP40R TP1 TESTPOINT
   ( 1 /TRST_N )
  )
@@ -985,66 +1000,12 @@
  ( /4A438B55 TPS40 TP10 TESTPOINT
   ( 1 +BATT )
  )
- ( /4A4779DA/4A47FB6C TPS40 TP11 TESTPOINT
-  ( 1 /MEMORY/SDPWEN )
- )
- ( /4A4779DA/4A47FBB1 TPS40 TP12 TESTPOINT
-  ( 1 /MEMORY/SDD0 )
- )
- ( /4A4779DA/4A47FBB8 TPS40 TP13 TESTPOINT
-  ( 1 /MEMORY/SDD1 )
- )
- ( /4A4779DA/4A47FBB9 TPS40 TP14 TESTPOINT
-  ( 1 /MEMORY/SDD2 )
- )
- ( /4A4779DA/4A47FBC7 TPS40 TP15 TESTPOINT
-  ( 1 /MEMORY/SDD3 )
- )
- ( /4A4779DA/4A47FBC8 TPS40 TP16 TESTPOINT
-  ( 1 /MEMORY/SDCLK )
- )
- ( /4A4779DA/4A47FBE2 TPS40 TP17 TESTPOINT
-  ( 1 /MEMORY/SDCMD )
- )
- ( /4A4779DA/4A47FBE3 TPS40 TP18 TESTPOINT
-  ( 1 /MEMORY/SDDET )
- )
- ( /4A4779DA/4A47FBE5 TPS40 TP19 TESTPOINT
-  ( 1 /MEMORY/CS1_N )
- )
- ( /4A4779DA/4A47FBE6 TPS40 TP20 TESTPOINT
-  ( 1 /MEMORY/CS2_N )
- )
- ( /4A4779DA/4A47FBE7 TPS40 TP21 TESTPOINT
-  ( 1 /MEMORY/FRE_N )
- )
  ( /4A4779DA/4A4783D4 TP40x20 TP23 TESTPOINT
   ( 1 /MEMORY/GPB18 )
  )
- ( /4A46EDD2/4A4631B5 TPS40 TP24 TESTPOINT
-  ( 1 /AUDIO/POP )
- )
  ( /4A4779DA/4A4782DD TPS40 TP25 TESTPOINT
   ( 1 /MEMORY/GPB30 )
  )
- ( /4A4779DA/4A47FBEF TPS40 TP26 TESTPOINT
-  ( 1 /MEMORY/FWE_N )
- )
- ( /4A4779DA/4A47FBF0 TP40x20 TP27 TESTPOINT
-  ( 1 /MEMORY/RDWR_N )
- )
- ( /4A4779DA/4A47FBF1 TP40x20 TP28 TESTPOINT
-  ( 1 /MEMORY/CKO )
- )
- ( /4A4779DA/4A47FBF2 TPS40 TP29 TESTPOINT
-  ( 1 /MEMORY/FRB_N )
- )
- ( /4A4779DA/4A47FBF3 TP40x20 TP30 TESTPOINT
-  ( 1 /MEMORY/DCS0_N )
- )
- ( /4A4779DA/4A47FBF4 TP40x20 TP31 TESTPOINT
-  ( 1 /MEMORY/CKE )
- )
  ( /4A438A93 TP40R TP32 TESTPOINT
   ( 1 /CHARGE_N )
  )
@@ -1057,117 +1018,12 @@
  ( /4A481D3C/4A4820CF TP40x20 TP38 TESTPOINT
   ( 1 /LCD_USB/GPD15 )
  )
- ( /4A481D3C/4A47FBB1 TPS40 TP39 TESTPOINT
-  ( 1 /LCD_USB/LCD0 )
- )
- ( /4A481D3C/4A47FBB8 TPS40 TP40 TESTPOINT
-  ( 1 /LCD_USB/LCD1 )
- )
- ( /4A481D3C/4A47FBB9 TPS40 TP41 TESTPOINT
-  ( 1 /LCD_USB/LCD2 )
- )
- ( /4A481D3C/4A47FBC7 TPS40 TP42 TESTPOINT
-  ( 1 /LCD_USB/LCD3 )
- )
- ( /4A481D3C/4A47FBEF TPS40 TP43 TESTPOINT
-  ( 1 /LCD_USB/LCD4 )
- )
- ( /4A481D3C/4A47FBF0 TPS40 TP44 TESTPOINT
-  ( 1 /LCD_USB/LCD5 )
- )
- ( /4A481D3C/4A47FBF1 TPS40 TP45 TESTPOINT
-  ( 1 /LCD_USB/LCD6 )
- )
- ( /4A481D3C/4A47FBF2 TPS40 TP46 TESTPOINT
-  ( 1 /LCD_USB/LCD7 )
- )
- ( /4A481D3C/4A47FBF3 TPS40 TP47 TESTPOINT
-  ( 1 /LCD_USB/LCDDCLK )
- )
- ( /4A481D3C/4A47FBF4 TPS40 TP48 TESTPOINT
-  ( 1 /LCD_USB/VSYNC )
- )
- ( /4A481D3C/4A47FBE2 TPS40 TP49 TESTPOINT
-  ( 1 /LCD_USB/HSYNC )
- )
- ( /4A481D3C/4A47FBE3 TPS40 TP50 TESTPOINT
-  ( 1 /LCD_USB/LCDCS )
- )
- ( /4A481D3C/4A47FBE5 TPS40 TP51 TESTPOINT
-  ( 1 /LCD_USB/LCDSCL )
- )
- ( /4A481D3C/4A47FBE6 TPS40 TP52 TESTPOINT
-  ( 1 /LCD_USB/LCDSDA )
- )
- ( /4A46EDD2/4A46D860 TPS40 TP53 TESTPOINT
-  ( 1 /AUDIO/HPOL )
- )
- ( /4A46EDD2/4A46D868 TP40x20 TP54 TESTPOINT
-  ( 1 /AUDIO/HPOR )
- )
- ( /4A46EDD2/4A46D869 TP40x20 TP55 TESTPOINT
-  ( 1 /AUDIO/HPGND )
- )
- ( /4A46EDD2/4A46D870 TPS40 TP56 TESTPOINT
-  ( 1 /AUDIO/AMPEN )
- )
- ( /4A46EDD2/4A46D871 TP40x20 TP57 TESTPOINT
-  ( 1 /AUDIO/HPLO )
- )
- ( /4A46EDD2/4A46D872 TP40x20 TP58 TESTPOINT
-  ( 1 /AUDIO/HPRO )
- )
- ( /4A46ED00/4A4631B5 TPS40 TP59 TESTPOINT
-  ( 1 /KEY_MAT3 )
- )
- ( /4A46ED00/4A46328B TPS40 TP60 TESTPOINT
-  ( 1 /KEY_MAT5 )
- )
- ( /4A46ED00/4A463291 TPS40 TP61 TESTPOINT
-  ( 1 /KEY_MAT6 )
- )
- ( /4A46ED00/4A463292 TPS40 TP62 TESTPOINT
-  ( 1 /KEY_MAT7 )
- )
- ( /4A46ED00/4A46329A TPS40 TP63 TESTPOINT
-  ( 1 /KEY_MAT8 )
- )
- ( /4A46ED00/4A46329B TPS40 TP64 TESTPOINT
-  ( 1 /KEY_MAT9 )
- )
  ( /4A46ED00/4A46329C TPS40 TP65 TESTPOINT
   ( 1 /KEY_MAT10 )
  )
- ( /4A46ED00/4A46329D TPS40 TP66 TESTPOINT
-  ( 1 /KEY_MAT12 )
- )
- ( /4A46ED00/4A4632A4 TPS40 TP67 TESTPOINT
-  ( 1 /KEY_MAT4 )
- )
- ( /4A46ED00/4A4632A5 TPS40 TP68 TESTPOINT
-  ( 1 /KEY_MAT11 )
- )
  ( /4A46ED00/4A4632A6 TPS40 TP69 TESTPOINT
   ( 1 /KEY_MAT13 )
  )
- ( /4A46ED00/4A4632A7 TPS40 TP70 TESTPOINT
-  ( 1 /KEY_MAT14 )
- )
- ( /4A46ED00/4A4632A8 TPS40 TP71 TESTPOINT
-  ( 1 /KEY_MAT15 )
- )
- ( /4A46ED00/4A4632A9 TPS40 TP72 TESTPOINT
-  ( 1 /KEY_MAT16 )
- )
- ( /4A46ED00/4A4632AA TPS40 TP73 TESTPOINT
-  ( 1 /KEY_MAT17 )
- )
- ( /4A46ED00/4A4632AB TPS40 TP74 TESTPOINT
-  ( 1 /RXD )
- )
- ( /4A4779DA/4A7F8308 TPS40 TP75 TESTPOINT
-  ( 1 /TXD )
- )
  ( /4A438B3F TPS40 TP76 TESTPOINT
   ( 1 GND )
  )
@@ -1177,27 +1033,6 @@
  ( /4A438B33 TPS40 TP78 TESTPOINT
   ( 1 /SHUTDOWN )
  )
- ( /4A481D3C/4A47FB6C TPS40 TP79 TESTPOINT
-  ( 1 /LCD_USB/USBDET )
- )
- ( /4A4779DA/4A7F6EE5 TPS40 TP80 TESTPOINT
-  ( 1 /MEMORY/GPB28 )
- )
- ( /4A481D3C/4A6C6E3C TP40x20 TP81 TESTPOINT
-  ( 1 /LCD_USB/XP )
- )
- ( /4A481D3C/4A6C6E45 TP40x20 TP82 TESTPOINT
-  ( 1 /LCD_USB/YP )
- )
- ( /4A481D3C/4A7F79C9 TP40x20 TP83 TESTPOINT
-  ( 1 /LCD_USB/YN )
- )
- ( /4A481D3C/4A7F79CA TP40x20 TP84 TESTPOINT
-  ( 1 /LCD_USB/XN )
- )
- ( /4A481D3C/4A837BD1 TPS40 TP85 TESTPOINT
-  ( 1 /LCD_USB/VHOST )
- )
  ( /4A4747A9 JZ4720 U1 JZ4720_186P
   ( 1 /LCD_USB/LCDD0 )
   ( 2 /LCD_USB/DCLK )
@@ -1254,14 +1089,14 @@
   ( 53 /MEMORY/D1 )
   ( 54 /MEMORY/D2 )
   ( 55 /MEMORY/D3 )
-  ( 56 /LCD_USB/USBDET )
+  ( 56 N-000100 )
   ( 57 /MEMORY/BUZPWM )
   ( 58 /MEMORY/18 )
   ( 59 /MEMORY/19 )
   ( 60 /MEMORY/GPB30 )
-  ( 61 /AUDIO/POP )
-  ( 62 N-000137 )
-  ( 63 /MEMORY/GPB28 )
+  ( 61 /MEMORY/POP )
+  ( 62 N-000143 )
+  ( 63 ? )
   ( 64 /MEMORY/FWE_N )
   ( 65 /MEMORY/FRE_N )
   ( 66 +BATT )
@@ -1276,10 +1111,10 @@
   ( 75 /KEY_MAT16 )
   ( 76 +BATT )
   ( 77 GND )
-  ( 78 /MEMORY/SDD3 )
-  ( 79 /MEMORY/SDD2 )
-  ( 80 /MEMORY/SDD1 )
-  ( 81 /MEMORY/SDD0 )
+  ( 78 N-000095 )
+  ( 79 N-000137 )
+  ( 80 N-000139 )
+  ( 81 N-000094 )
   ( 82 ? )
   ( 83 ? )
   ( 84 /KEY_MAT4 )
@@ -1291,13 +1126,13 @@
   ( 90 /EXTAL )
   ( 91 +BATT )
   ( 92 /LCD_USB/BATIN )
-  ( 93 N-000170 )
+  ( 93 N-000177 )
   ( 94 GND )
   ( 95 /VDDADC )
-  ( 96 /LCD_USB/XP )
-  ( 97 /LCD_USB/YP )
-  ( 98 /LCD_USB/YN )
-  ( 99 /LCD_USB/XN )
+  ( 96 ? )
+  ( 97 ? )
+  ( 98 ? )
+  ( 99 ? )
   ( 100 +BATT )
   ( 101 GND )
   ( 102 GND )
@@ -1307,8 +1142,8 @@
   ( 106 /LCD_USB2 )
   ( 107 /LCD_USB1 )
   ( 108 GND )
-  ( 109 N-000192 )
-  ( 110 N-000195 )
+  ( 109 N-000199 )
+  ( 110 N-000202 )
   ( 111 +BATT )
   ( 112 +BATT )
   ( 113 /LCD_USB/DN )
@@ -1326,14 +1161,14 @@
   ( 125 /PW_ON_N )
   ( 126 +BATT )
   ( 127 +BATT )
-  ( 128 /AUDIO/HPRO )
-  ( 129 /AUDIO/HPRO )
+  ( 128 N-000072 )
+  ( 129 N-000072 )
   ( 130 GND )
   ( 131 GND )
   ( 132 GND )
   ( 133 GND )
-  ( 134 /AUDIO/HPLO )
-  ( 135 /AUDIO/HPLO )
+  ( 134 N-000058 )
+  ( 135 N-000058 )
   ( 136 +BATT )
   ( 137 +BATT )
   ( 138 GND )
@@ -1351,14 +1186,14 @@
   ( 150 /TMS )
   ( 151 /TRST_N )
   ( 152 /SHUTDOWN )
-  ( 153 /AUDIO/AMPEN )
-  ( 154 /MEMORY/SDPWEN )
+  ( 153 N-000068 )
+  ( 154 N-000097 )
   ( 155 ? )
   ( 156 /LCD_USB/GPD15 )
   ( 157 /MEMORY/GPB18 )
-  ( 158 N-000075 )
-  ( 159 /LCD_USB/LCDSCL )
-  ( 160 /LCD_USB/LCDSDA )
+  ( 158 N-000081 )
+  ( 159 N-000102 )
+  ( 160 N-000101 )
   ( 161 /LCD_USB/VSYNC )
   ( 162 /LCD_USB/HSYNC )
   ( 163 /LCD_USB/LCDCS )
@@ -1378,7 +1213,7 @@
   ( 177 /LCD_USB/LCDD6 )
   ( 178 /LCD_USB/LCDD5 )
   ( 179 /LCD_USB/LCDD4 )
-  ( 180 N-000025 )
+  ( 180 N-000003 )
   ( 181 GND )
   ( 182 /LCD_USB/LCDD3 )
   ( 183 /LCD_USB/LCDD2 )
@@ -1389,29 +1224,29 @@
  ( /4A41ABEA SOT23_5 U2 EUP3406
   ( 1 /PWEN )
   ( 2 GND )
-  ( 3 N-000013 )
+  ( 3 N-000020 )
   ( 4 +BATT )
-  ( 5 N-000012 )
+  ( 5 N-000021 )
  )
  ( /4A419E6D SOT23_5 U3 EUP3406
-  ( 1 N-000015 )
+  ( 1 N-000017 )
   ( 2 GND )
-  ( 3 N-000017 )
+  ( 3 N-000016 )
   ( 4 +BATT )
-  ( 5 N-000014 )
+  ( 5 N-000019 )
  )
  ( /4A40ED7D SOT23_5 U4 BL8555-33PRA
   ( 1 +BATT )
   ( 2 GND )
   ( 3 +BATT )
-  ( 4 N-000016 )
-  ( 5 N-000016 )
+  ( 4 N-000018 )
+  ( 5 N-000018 )
  )
  ( /4A4030C0 SOT23_5 U5 SE9016
   ( 1 N-000006 )
   ( 2 GND )
   ( 3 +BATT )
-  ( 4 N-000005 )
+  ( 4 N-000004 )
   ( 5 +BATT )
  )
  ( /4A439868 SOT23 U6 BL8509-263DNRM
@@ -1534,15 +1369,15 @@
   ( 1 /AUDIO/SP- )
   ( 2 /AUDIO/SP+ )
   ( 3 GND )
-  ( 4 N-000060 )
-  ( 5 N-000059 )
-  ( 6 N-000060 )
-  ( 7 N-000057 )
-  ( 8 N-000058 )
+  ( 4 N-000066 )
+  ( 5 N-000065 )
+  ( 6 N-000066 )
+  ( 7 N-000063 )
+  ( 8 N-000064 )
  )
  ( /4A481D3C/4A48307F SOP08 U11 SCIC
   ( 1 GND )
-  ( 2 N-000200 )
+  ( 2 N-000207 )
   ( 3 ? )
   ( 4 GND )
   ( 5 /LCD_USB/GPC9 )
@@ -1552,10 +1387,10 @@
  )
  ( /4A481D3C/4A7C0E4A DCB U12 LT3925EDCB
   ( 1 /LCD_USB/VHOST )
-  ( 2 N-000168 )
-  ( 3 N-000075 )
+  ( 2 N-000174 )
+  ( 3 N-000081 )
   ( 4 GND )
-  ( 5 N-000171 )
+  ( 5 N-000178 )
   ( 6 GND )
   ( 7 GND )
   ( 8 +BATT )
@@ -1566,7 +1401,7 @@
  )
  ( /4A476EAC CRYSTAL1 Y2 12MHz
   ( 1 /XTAL )
-  ( 2 N-000020 )
+  ( 2 N-000011 )
  )
 )
 *
@@ -2161,5 +1996,9 @@ $component R50
  SM0603
  SM0805
 $endlist
+$component SW1
+ SWITCH
+ SW
+$endlist
 $endfootprintlist
 }
diff --git a/main/Qi_AVT2.pro b/main/Qi_AVT2.pro
index 18d7ece..7c3a075 100755
--- a/main/Qi_AVT2.pro
+++ b/main/Qi_AVT2.pro
@@ -1,4 +1,4 @@
-update=4/9/2009-22:09:50
+update=13/9/2009-03:07:39
 last_client=cvpcb
 [common]
 NetDir=
@@ -51,6 +51,9 @@ ShowRat=0
 ShowMRa=1
 [pcbnew/libraries]
 LibDir=
+LibName1=/home/cain/Embedded/ingenic/work/Qi/qi-avt2_kicad/board-qi-avt2/models/M35NN
+LibName2=/home/cain/Embedded/ingenic/work/Qi/qi-avt2_kicad/board-qi-avt2/models/ESP_3P
+LibName3=/home/cain/Embedded/ingenic/work/Qi/qi-avt2_kicad/board-qi-avt2/models/M01_15
 [eeschema]
 version=1
 LibDir=
@@ -86,65 +89,8 @@ UseNetN=0
 LabSize=60
 [eeschema/libraries]
 LibName1=power
-LibName38=device
-LibName39=conn
-LibName40=linear
-LibName41=regul
-LibName42=74xx
-LibName43=cmos4000
-LibName44=adc-dac
-LibName45=memory
-LibName46=xilinx
-LibName47=special
-LibName48=microcontrollers
-LibName49=dsp
-LibName50=microchip
-LibName51=analog_switches
-LibName52=motorola
-LibName53=texas
-LibName54=intel
-LibName55=audio
-LibName56=interface
-LibName57=digital-audio
-LibName58=philips
-LibName59=display
-LibName60=cypress
-LibName61=siliconi
-LibName62=contrib
-LibName63=valves
-LibName64=../components/bat_con
-LibName65=../components/vrtc
-LibName66=../components/vddhp
-LibName67=../components/vbus
-LibName68=../components/vbato
-LibName69=../components/vbat
-LibName70=../components/v33sd
-LibName71=../components/v33
-LibName72=../components/v18
-LibName73=../components/usb_minib
-LibName74=../components/tm2302n
-LibName75=../components/tm2301n
-LibName76=../components/testpoint
-LibName77=../components/sw_metaldomn
-LibName78=../components/spy0030a
-LibName79=../components/speaker
-LibName80=../components/solderpaste
-LibName81=../components/se9016
-LibName82=../components/sdcw2012
-LibName83=../components/scic
-LibName84=../components/phonejack
-LibName85=../components/p3v56s40etp-g6
-LibName86=../components/ms_1d77
-LibName87=../components/microphone
-LibName88=../components/jz4720_186p
-LibName89=../components/inductorp
-LibName90=../components/hy27ug088g5m
-LibName91=../components/fpccon24
-LibName92=../components/eup3406
-LibName93=../components/cpolarized
-LibName94=../components/bl8555-33pra
-LibName95=../components/bl8509-263dnrm
-LibName96=../components/bl8506-30nrm
+LibName2=../components/boot_switch
+LibName3=../components/hd
 [cvpcb]
 version=1
 NetIExt=.net
diff --git a/main/Qi_AVT2.sch b/main/Qi_AVT2.sch
old mode 100755
new mode 100644
index f29b86f..4b784a7
--- a/main/Qi_AVT2.sch
+++ b/main/Qi_AVT2.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,./Qi_AVT2.cache
+LIBS:power,../components/boot_switch,../components/hd,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
@@ -13,686 +13,797 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Kmarq B 2100 2650 "Warning: Pin power_out connected to Pin BiDi (net 2)" F=1
-Wire Wire Line
-	2100 2650 2100 2750
-Wire Wire Line
-	14450 6400 14450 6300
-Wire Wire Line
-	14450 6300 14600 6300
-Wire Wire Line
-	14600 5900 14050 5900
 Wire Notes Line
-	14800 5150 10600 5150
+	14200 9100 14200 8100
 Wire Notes Line
-	14800 5150 14800 1000
+	14200 9100 15850 9100
 Wire Notes Line
-	14800 1000 10600 1000
-Wire Wire Line
-	9650 10100 9650 9850
-Wire Wire Line
-	10650 9450 10650 9300
-Wire Wire Line
-	11650 9450 11650 9300
-Connection ~ 10150 9300
-Connection ~ 11150 9300
-Connection ~ 11650 10000
-Wire Wire Line
-	11650 9850 11650 10000
-Connection ~ 10650 10000
-Wire Wire Line
-	10650 9850 10650 10000
-Wire Wire Line
-	9650 10000 12150 10000
-Wire Wire Line
-	12150 10000 12150 9850
+	15850 9100 15850 8100
 Wire Notes Line
-	10600 1000 10600 5150
-Wire Notes Line
-	5900 9350 8950 9350
-Wire Notes Line
-	5900 9350 5900 10700
-Wire Notes Line
-	5900 10700 8950 10700
-Wire Notes Line
-	8950 10700 8950 9350
-Connection ~ 8750 3450
+	15850 8100 14200 8100
 Wire Wire Line
-	9050 3450 8750 3450
+	14500 7250 14950 7250
 Wire Wire Line
-	10400 8200 10350 8200
-Connection ~ 10350 8150
+	13450 6450 13450 6300
 Wire Wire Line
-	10350 8200 10350 8150
+	12450 6500 12450 6450
 Wire Wire Line
-	8750 7450 10200 7450
-Connection ~ 2500 2750
+	2500 2750 2100 2750
 Wire Wire Line
-	4650 2200 4650 1600
+	14600 6100 14050 6100
+Connection ~ 2500 2200
 Wire Wire Line
-	2400 3750 1700 3750
+	2500 2150 2500 2250
+Connection ~ 12800 9300
 Wire Wire Line
-	2650 3300 2650 3450
-Connection ~ 2950 2700
+	12800 9250 12800 9450
+Connection ~ 12800 10000
 Wire Wire Line
-	2650 2800 2650 2700
-Wire Wire Line
-	2650 2700 3200 2700
-Connection ~ 4650 2200
-Wire Wire Line
-	4650 1600 3300 1600
-Wire Wire Line
-	2950 1600 2450 1600
-Connection ~ 2450 1600
-Wire Wire Line
-	2500 2000 2450 2000
-Connection ~ 3000 2000
-Wire Wire Line
-	3000 2200 3000 1850
-Wire Wire Line
-	5100 3550 5200 3550
-Wire Wire Line
-	5750 3100 5750 3250
-Wire Wire Line
-	5750 3250 5650 3250
-Wire Wire Line
-	4650 3250 4550 3250
-Wire Wire Line
-	4400 2700 4550 2700
-Wire Wire Line
-	4400 2450 4700 2450
-Wire Wire Line
-	4700 2450 4700 2700
-Wire Wire Line
-	4700 2700 5300 2700
-Connection ~ 4900 2700
-Wire Wire Line
-	5300 2700 5300 2650
-Wire Wire Line
-	5300 2650 5350 2650
-Wire Wire Line
-	4900 2250 4900 2100
-Wire Wire Line
-	2900 9250 2900 9300
-Wire Wire Line
-	12450 7700 12450 7850
-Connection ~ 12350 8000
-Wire Wire Line
-	12350 8150 12350 7550
-Wire Wire Line
-	12350 8000 12250 8000
-Wire Wire Line
-	12350 7550 12250 7550
-Connection ~ 12800 7800
-Wire Wire Line
-	12800 7800 12800 7850
-Wire Wire Line
-	12250 7800 13300 7800
-Wire Wire Line
-	13100 7800 13100 7850
-Wire Wire Line
-	13100 8350 13100 8250
-Connection ~ 13100 7800
-Wire Wire Line
-	12250 7500 12550 7500
-Wire Wire Line
-	12550 7500 12550 7200
-Wire Wire Line
-	12550 7200 13300 7200
-Wire Wire Line
-	13900 7200 14000 7200
-Wire Wire Line
-	13100 7250 13100 7200
-Wire Wire Line
-	12300 6900 12400 6900
-Connection ~ 12300 6900
-Connection ~ 12300 6700
-Wire Wire Line
-	12300 6700 12250 6700
-Connection ~ 12300 6800
-Wire Wire Line
-	12300 6800 12250 6800
-Connection ~ 12300 7050
-Wire Wire Line
-	12300 7050 12250 7050
-Connection ~ 12300 7150
-Wire Wire Line
-	12300 7150 12250 7150
-Connection ~ 12300 7250
-Wire Wire Line
-	12300 7250 12250 7250
-Connection ~ 13300 5750
-Wire Wire Line
-	13300 5700 13300 5750
-Wire Wire Line
-	12950 6450 13050 6450
-Connection ~ 13450 6400
-Wire Wire Line
-	12250 6400 13450 6400
-Wire Wire Line
-	13150 6300 13150 6350
-Wire Wire Line
-	13150 6350 12250 6350
-Wire Wire Line
-	12250 6100 12650 6100
-Wire Wire Line
-	12250 6000 12650 6000
-Wire Wire Line
-	10000 8550 10000 8600
-Connection ~ 10300 8000
-Wire Wire Line
-	10300 8300 10300 7650
-Connection ~ 10300 7700
-Wire Wire Line
-	10300 7750 10400 7750
-Connection ~ 8750 7450
-Wire Wire Line
-	8750 7400 8750 7500
-Connection ~ 9250 8050
-Connection ~ 9250 7450
-Wire Wire Line
-	9250 7450 9250 7500
-Connection ~ 10300 7050
-Wire Wire Line
-	10200 7050 10400 7050
-Connection ~ 10300 7150
-Wire Wire Line
-	10300 7150 10400 7150
-Connection ~ 10300 7250
-Wire Wire Line
-	10300 7250 10400 7250
-Connection ~ 10300 6650
-Wire Wire Line
-	10200 6650 10400 6650
-Connection ~ 10300 6750
-Wire Wire Line
-	10300 6750 10400 6750
-Connection ~ 10300 6850
-Wire Wire Line
-	10300 6850 10400 6850
-Wire Wire Line
-	10400 6500 10000 6500
-Connection ~ 9250 6000
-Wire Wire Line
-	9050 6000 10400 6000
-Wire Wire Line
-	8650 6000 8500 6000
-Wire Wire Line
-	8650 5300 8500 5300
-Connection ~ 9650 6000
-Wire Wire Line
-	9250 5950 9250 6000
-Wire Wire Line
-	8150 6850 8000 6850
-Connection ~ 8800 6150
-Wire Wire Line
-	10400 6150 8550 6150
-Connection ~ 9200 6150
-Wire Wire Line
-	8800 6150 8800 6200
-Wire Wire Line
-	9200 6250 9200 6150
-Wire Wire Line
-	9800 6850 9900 6850
-Wire Wire Line
-	9900 6850 9900 6200
-Wire Wire Line
-	9900 6200 10400 6200
-Wire Wire Line
-	9650 5400 9650 5300
-Wire Wire Line
-	9850 5950 9850 5300
-Wire Wire Line
-	9850 5950 10400 5950
-Wire Wire Line
-	9100 2000 8400 2000
-Wire Wire Line
-	7400 5800 6700 5800
-Wire Wire Line
-	6700 4800 6350 4800
-Wire Wire Line
-	6350 5350 6350 5450
-Wire Wire Line
-	6700 5750 6700 5850
-Connection ~ 6700 6800
-Wire Wire Line
-	6350 4800 6350 4850
-Wire Wire Line
-	6700 8050 6700 8150
-Wire Wire Line
-	8500 2650 8500 2850
-Connection ~ 6700 7500
-Wire Wire Line
-	6700 7650 6700 7350
-Wire Wire Line
-	5950 7500 6700 7500
-Connection ~ 7900 2850
-Wire Wire Line
-	7900 2520 7900 2900
-Wire Wire Line
-	8150 1550 8500 1550
-Wire Wire Line
-	7400 2000 7250 2000
-Wire Wire Line
-	7250 2000 7250 1400
-Wire Wire Line
-	8750 3385 8750 3550
-Wire Wire Line
-	8750 4050 8750 4150
-Wire Wire Line
-	2900 7350 2900 7400
-Wire Wire Line
-	5050 6600 5050 6800
-Connection ~ 5050 7250
-Wire Wire Line
-	5050 7300 5050 7200
-Wire Wire Line
-	4700 7200 4700 7250
-Wire Wire Line
-	4700 7250 5050 7250
-Connection ~ 4700 6700
-Wire Wire Line
-	4100 6700 5050 6700
-Connection ~ 3950 7450
-Wire Wire Line
-	3400 7050 3600 7050
-Wire Wire Line
-	3600 7050 3600 7450
-Wire Wire Line
-	3600 7450 4250 7450
-Connection ~ 4250 6850
-Wire Wire Line
-	4250 6900 4250 6700
-Wire Wire Line
-	3950 7350 3950 7450
-Connection ~ 4250 7450
-Wire Wire Line
-	4250 8050 4250 8100
-Wire Wire Line
-	1800 7150 1800 7200
-Wire Wire Line
-	1800 6600 1800 6750
-Connection ~ 1800 6700
-Wire Wire Line
-	2400 6700 1800 6700
-Wire Wire Line
-	4250 7550 4250 7400
-Wire Wire Line
-	3950 6950 3950 6850
-Wire Wire Line
-	3950 6850 4250 6850
-Wire Wire Line
-	3500 6700 3400 6700
-Wire Wire Line
-	4700 6700 4700 6800
-Connection ~ 4250 6700
-Connection ~ 5050 6700
-Connection ~ 5050 9150
-Wire Wire Line
-	5050 9200 5050 9100
-Wire Wire Line
-	4700 9100 4700 9150
-Wire Wire Line
-	4700 9150 5050 9150
-Connection ~ 4700 8600
-Connection ~ 3950 9350
-Wire Wire Line
-	3400 8950 3600 8950
-Wire Wire Line
-	3600 8950 3600 9350
-Wire Wire Line
-	3600 9350 4250 9350
-Connection ~ 4250 8750
-Wire Wire Line
-	4250 8600 4250 8800
-Wire Wire Line
-	3950 9250 3950 9350
-Connection ~ 4250 9350
-Wire Wire Line
-	4250 9950 4250 10000
-Wire Wire Line
-	1700 9400 1250 9400
-Wire Wire Line
-	2200 9400 2300 9400
-Wire Wire Line
-	2400 8950 2300 8950
-Wire Wire Line
-	1800 9050 1800 9100
-Wire Wire Line
-	1800 8500 1800 8650
-Connection ~ 1800 8600
-Connection ~ 4300 5050
-Wire Wire Line
-	4300 4950 4300 5100
-Wire Wire Line
-	4150 5050 4300 5050
-Wire Wire Line
-	3750 5050 3650 5050
-Wire Wire Line
-	3150 5700 3150 5750
-Wire Wire Line
-	2050 5050 2650 5050
-Wire Wire Line
-	2050 5500 2050 5650
-Wire Wire Line
-	2650 5350 2600 5350
-Wire Wire Line
-	2600 5350 2600 5050
-Connection ~ 2600 5050
-Wire Wire Line
-	2050 4950 2050 5100
-Connection ~ 2050 5050
-Wire Wire Line
-	3700 5050 3700 5350
-Connection ~ 3700 5050
-Wire Wire Line
-	3700 5350 3650 5350
-Wire Wire Line
-	4300 5600 4300 5650
-Wire Wire Line
-	2400 8600 1800 8600
-Wire Wire Line
-	2300 8950 2300 9450
-Connection ~ 2300 9400
-Wire Wire Line
-	2300 9850 2300 9900
-Wire Wire Line
-	4250 9450 4250 9300
-Wire Wire Line
-	3950 8850 3950 8750
-Wire Wire Line
-	3950 8750 4250 8750
-Wire Wire Line
-	3500 8600 3400 8600
-Wire Wire Line
-	4700 8700 4700 8600
-Connection ~ 4250 8600
-Wire Wire Line
-	5050 8450 5050 8700
-Connection ~ 5050 8600
-Wire Wire Line
-	2050 7050 2400 7050
-Wire Wire Line
-	6250 9750 6250 10550
-Wire Wire Line
-	6550 9750 6550 10550
-Wire Wire Line
-	6850 9750 6850 10550
-Wire Wire Line
-	7150 9750 7150 10550
-Wire Wire Line
-	7450 9750 7450 10550
-Wire Wire Line
-	7750 9750 7750 10250
-Wire Wire Line
-	8050 9750 8050 10550
-Wire Wire Line
-	8350 9750 8350 10550
-Wire Wire Line
-	7595 3475 7595 4150
-Wire Wire Line
-	7595 4150 7650 4150
-Wire Wire Line
-	8900 4150 8650 4150
-Connection ~ 8750 4150
-Wire Wire Line
-	7650 1550 7250 1550
-Connection ~ 7250 1550
-Connection ~ 8500 2000
-Wire Wire Line
-	8500 2850 7900 2850
-Wire Wire Line
-	8150 4670 8150 4720
-Wire Wire Line
-	6700 6850 6700 6750
-Connection ~ 6700 4800
-Connection ~ 6700 5800
-Wire Wire Line
-	6700 6350 6700 6400
-Wire Wire Line
-	5700 5450 6450 5450
-Connection ~ 6350 5450
-Wire Wire Line
-	6700 4750 6700 5400
-Wire Wire Line
-	8500 1550 8500 2250
-Wire Wire Line
-	9650 6000 9650 5900
-Wire Wire Line
-	9200 6850 9200 6750
-Wire Wire Line
-	8800 6800 8800 6850
-Connection ~ 9200 6850
-Wire Wire Line
-	9300 6850 8550 6850
-Connection ~ 8800 6850
-Wire Wire Line
-	8150 6150 8000 6150
-Wire Wire Line
-	9250 5300 9250 5350
-Connection ~ 9650 5300
-Wire Wire Line
-	9850 5300 9050 5300
-Connection ~ 9250 5300
-Wire Wire Line
-	10000 6400 10400 6400
-Wire Wire Line
-	10000 6450 10400 6450
-Wire Wire Line
-	10300 6650 10300 6900
-Wire Wire Line
-	10300 6900 10400 6900
-Wire Wire Line
-	10300 6800 10400 6800
-Connection ~ 10300 6800
-Wire Wire Line
-	10300 6700 10400 6700
-Connection ~ 10300 6700
-Wire Wire Line
-	10300 7050 10300 7300
-Wire Wire Line
-	10300 7300 10400 7300
-Wire Wire Line
-	10300 7200 10400 7200
-Connection ~ 10300 7200
-Wire Wire Line
-	10300 7100 10400 7100
-Connection ~ 10300 7100
-Wire Wire Line
-	9750 7500 9750 7450
-Connection ~ 9750 7450
-Wire Wire Line
-	9750 7900 9750 8050
-Wire Wire Line
-	9750 8050 8750 8050
-Wire Wire Line
-	8750 8050 8750 7900
-Wire Wire Line
-	9250 8100 9250 7900
-Wire Wire Line
-	10300 7650 10400 7650
-Wire Wire Line
-	10400 7700 10300 7700
-Wire Wire Line
-	10300 8000 10400 8000
-Connection ~ 10300 7750
-Wire Wire Line
-	10400 7950 10000 7950
-Wire Wire Line
-	10000 7950 10000 8150
-Wire Wire Line
-	12250 5950 12650 5950
-Wire Wire Line
-	12250 6050 12650 6050
-Wire Wire Line
-	12250 6150 12650 6150
-Wire Wire Line
-	13450 6300 13450 6450
-Wire Wire Line
-	12450 6450 12250 6450
-Wire Wire Line
-	13450 5800 13450 5750
-Wire Wire Line
-	13450 5750 13150 5750
-Wire Wire Line
-	13150 5750 13150 5800
-Wire Wire Line
-	12250 6600 12300 6600
-Wire Wire Line
-	12300 6600 12300 7300
-Wire Wire Line
-	12300 7300 12250 7300
-Wire Wire Line
-	12300 7200 12250 7200
-Connection ~ 12300 7200
-Wire Wire Line
-	12300 7100 12250 7100
-Connection ~ 12300 7100
-Wire Wire Line
-	12300 7000 12250 7000
-Connection ~ 12300 7000
-Wire Wire Line
-	12300 6750 12250 6750
-Connection ~ 12300 6750
-Wire Wire Line
-	12300 6650 12250 6650
-Connection ~ 12300 6650
-Wire Wire Line
-	13100 7650 13100 7700
-Connection ~ 13100 7200
-Wire Wire Line
-	14000 7150 14000 7800
-Wire Wire Line
-	14000 7800 13900 7800
-Connection ~ 14000 7200
-Wire Wire Line
-	12800 8250 12800 8300
-Wire Wire Line
-	12800 8300 13100 8300
-Connection ~ 13100 8300
-Wire Wire Line
-	12250 7950 12350 7950
-Connection ~ 12350 7950
-Wire Wire Line
-	12450 7850 12250 7850
-Connection ~ 12450 7800
-Wire Wire Line
-	13450 6950 13450 7000
-Wire Wire Line
-	4900 2750 4900 2650
-Wire Wire Line
-	5350 2250 5300 2250
-Wire Wire Line
-	5300 2250 5300 2200
-Connection ~ 4900 2200
-Wire Wire Line
-	5300 2200 4400 2200
-Wire Wire Line
-	4550 2700 4550 3550
-Connection ~ 4550 3250
-Wire Wire Line
-	5150 3250 5050 3250
-Wire Wire Line
-	4550 3550 4700 3550
-Wire Wire Line
-	2500 2200 3200 2200
-Wire Wire Line
-	2900 2000 3000 2000
-Connection ~ 3000 2200
-Wire Wire Line
-	2450 2000 2450 1550
-Wire Wire Line
-	2950 2800 2950 2700
-Wire Wire Line
-	2650 3950 2650 3850
-Wire Wire Line
-	2950 3300 2950 3900
-Wire Wire Line
-	2950 3900 2650 3900
-Connection ~ 2650 3900
-Wire Wire Line
-	2500 2650 2500 2800
-Wire Wire Line
-	8650 9750 8650 10550
-Wire Wire Line
-	10200 7450 10200 8150
-Wire Wire Line
-	10200 8150 10400 8150
-Wire Wire Line
-	4100 8600 5500 8600
-Wire Notes Line
-	6100 1200 1500 1200
-Wire Notes Line
-	6100 1200 6100 4150
-Wire Notes Line
-	6100 4150 1500 4150
-Wire Notes Line
-	1500 4150 1500 1200
-Wire Wire Line
-	9650 9300 12150 9300
-Wire Wire Line
-	10150 10000 10150 9850
-Connection ~ 10150 10000
-Wire Wire Line
-	11150 10000 11150 9850
-Connection ~ 11150 10000
-Connection ~ 11650 9300
-Connection ~ 10650 9300
-Wire Wire Line
-	12150 9300 12150 9450
-Wire Wire Line
-	11150 9300 11150 9450
-Wire Wire Line
-	10150 9300 10150 9450
-Connection ~ 9650 10000
-Wire Wire Line
-	9650 9250 9650 9450
-Connection ~ 9650 9300
-Wire Wire Line
-	12800 10100 12800 9850
-Wire Wire Line
-	13800 9450 13800 9300
-Wire Wire Line
-	14800 9450 14800 9300
-Connection ~ 13300 9300
-Connection ~ 14300 9300
-Connection ~ 14800 10000
-Wire Wire Line
-	14800 9850 14800 10000
-Connection ~ 13800 10000
-Wire Wire Line
-	13800 9850 13800 10000
-Wire Wire Line
-	12800 10000 15300 10000
-Wire Wire Line
-	15300 10000 15300 9850
-Wire Wire Line
-	12800 9300 15300 9300
-Wire Wire Line
-	13300 10000 13300 9850
-Connection ~ 13300 10000
-Wire Wire Line
-	14300 10000 14300 9850
-Connection ~ 14300 10000
-Connection ~ 14800 9300
-Connection ~ 13800 9300
-Wire Wire Line
-	15300 9300 15300 9450
+	13300 9300 13300 9450
 Wire Wire Line
 	14300 9300 14300 9450
 Wire Wire Line
-	13300 9300 13300 9450
-Connection ~ 12800 10000
+	15300 9450 15300 9300
+Connection ~ 13800 9300
+Connection ~ 14800 9300
+Connection ~ 14300 10000
 Wire Wire Line
-	12800 9250 12800 9450
-Connection ~ 12800 9300
+	14300 10000 14300 9850
+Connection ~ 13300 10000
 Wire Wire Line
-	2500 2150 2500 2250
-Connection ~ 2500 2200
+	13300 10000 13300 9850
 Wire Wire Line
-	14600 6100 14050 6100
+	15300 9300 12800 9300
 Wire Wire Line
-	2100 2750 2500 2750
+	15300 9850 15300 10000
+Wire Wire Line
+	15300 10000 12800 10000
+Wire Wire Line
+	13800 10000 13800 9850
+Connection ~ 13800 10000
+Wire Wire Line
+	14800 10000 14800 9850
+Connection ~ 14800 10000
+Connection ~ 14300 9300
+Connection ~ 13300 9300
+Wire Wire Line
+	14800 9300 14800 9450
+Wire Wire Line
+	13800 9300 13800 9450
+Wire Wire Line
+	12800 10100 12800 9850
+Connection ~ 9650 9300
+Wire Wire Line
+	9650 9250 9650 9450
+Connection ~ 9650 10000
+Wire Wire Line
+	10150 9300 10150 9450
+Wire Wire Line
+	11150 9300 11150 9450
+Wire Wire Line
+	12150 9450 12150 9300
+Connection ~ 10650 9300
+Connection ~ 11650 9300
+Connection ~ 11150 10000
+Wire Wire Line
+	11150 10000 11150 9850
+Connection ~ 10150 10000
+Wire Wire Line
+	10150 10000 10150 9850
+Wire Wire Line
+	12150 9300 9650 9300
+Wire Notes Line
+	1500 4150 1500 1200
+Wire Notes Line
+	1500 4150 6100 4150
+Wire Notes Line
+	6100 4150 6100 1200
+Wire Notes Line
+	6100 1200 1500 1200
+Wire Wire Line
+	4100 8600 5500 8600
+Wire Wire Line
+	10400 8150 10200 8150
+Wire Wire Line
+	10200 8150 10200 7450
+Wire Wire Line
+	8650 9750 8650 10550
+Wire Wire Line
+	2500 2650 2500 2800
+Connection ~ 2650 3900
+Wire Wire Line
+	2650 3900 2950 3900
+Wire Wire Line
+	2950 3900 2950 3300
+Wire Wire Line
+	2650 3950 2650 3850
+Wire Wire Line
+	2950 2800 2950 2700
+Wire Wire Line
+	2450 1550 2450 2000
+Connection ~ 3000 2200
+Wire Wire Line
+	2900 2000 3000 2000
+Wire Wire Line
+	3200 2200 2500 2200
+Wire Wire Line
+	4700 3550 4550 3550
+Wire Wire Line
+	5150 3250 5050 3250
+Connection ~ 4550 3250
+Wire Wire Line
+	4550 3550 4550 2700
+Wire Wire Line
+	4400 2200 5300 2200
+Connection ~ 4900 2200
+Wire Wire Line
+	5300 2200 5300 2250
+Wire Wire Line
+	5300 2250 5350 2250
+Wire Wire Line
+	4900 2750 4900 2650
+Wire Wire Line
+	13450 6950 13450 7000
+Connection ~ 12450 7800
+Wire Wire Line
+	12250 7850 12450 7850
+Connection ~ 12350 7950
+Wire Wire Line
+	12250 7950 12350 7950
+Connection ~ 13100 8300
+Wire Wire Line
+	13100 8300 12800 8300
+Wire Wire Line
+	12800 8300 12800 8250
+Connection ~ 14000 7200
+Wire Wire Line
+	13900 7800 14000 7800
+Wire Wire Line
+	14000 7800 14000 7150
+Connection ~ 13100 7200
+Wire Wire Line
+	13100 7650 13100 7700
+Connection ~ 12300 6650
+Wire Wire Line
+	12300 6650 12250 6650
+Connection ~ 12300 6750
+Wire Wire Line
+	12300 6750 12250 6750
+Connection ~ 12300 7000
+Wire Wire Line
+	12300 7000 12250 7000
+Connection ~ 12300 7100
+Wire Wire Line
+	12300 7100 12250 7100
+Connection ~ 12300 7200
+Wire Wire Line
+	12300 7200 12250 7200
+Wire Wire Line
+	12250 7300 12300 7300
+Wire Wire Line
+	12300 7300 12300 6600
+Wire Wire Line
+	12300 6600 12250 6600
+Wire Wire Line
+	13150 5800 13150 5750
+Wire Wire Line
+	13150 5750 13450 5750
+Wire Wire Line
+	13450 5750 13450 5800
+Wire Wire Line
+	12450 6450 12250 6450
+Wire Wire Line
+	12250 6150 12650 6150
+Wire Wire Line
+	12250 6050 12650 6050
+Wire Wire Line
+	12250 5950 12650 5950
+Wire Wire Line
+	10000 8150 10000 7950
+Wire Wire Line
+	10000 7950 10400 7950
+Connection ~ 10300 7750
+Wire Wire Line
+	10300 8000 10400 8000
+Wire Wire Line
+	10400 7700 10300 7700
+Wire Wire Line
+	10400 7650 10300 7650
+Wire Wire Line
+	9250 8100 9250 7900
+Wire Wire Line
+	8750 7900 8750 8050
+Wire Wire Line
+	8750 8050 9750 8050
+Wire Wire Line
+	9750 8050 9750 7900
+Connection ~ 9750 7450
+Wire Wire Line
+	9750 7500 9750 7450
+Connection ~ 10300 7100
+Wire Wire Line
+	10300 7100 10400 7100
+Connection ~ 10300 7200
+Wire Wire Line
+	10300 7200 10400 7200
+Wire Wire Line
+	10400 7300 10300 7300
+Wire Wire Line
+	10300 7300 10300 7050
+Connection ~ 10300 6700
+Wire Wire Line
+	10300 6700 10400 6700
+Connection ~ 10300 6800
+Wire Wire Line
+	10300 6800 10400 6800
+Wire Wire Line
+	10400 6900 10300 6900
+Wire Wire Line
+	10300 6900 10300 6650
+Wire Wire Line
+	10000 6450 10400 6450
+Wire Wire Line
+	10000 6400 10400 6400
+Connection ~ 9250 5300
+Wire Wire Line
+	9050 5300 9850 5300
+Connection ~ 9650 5300
+Wire Wire Line
+	9250 5300 9250 5350
+Wire Wire Line
+	8150 6150 8000 6150
+Connection ~ 8800 6850
+Wire Wire Line
+	9300 6850 8550 6850
+Connection ~ 9200 6850
+Wire Wire Line
+	8800 6850 8800 6800
+Wire Wire Line
+	9200 6750 9200 6850
+Wire Wire Line
+	9650 5900 9650 6000
+Wire Wire Line
+	8500 2250 8500 1550
+Wire Wire Line
+	6700 4750 6700 5400
+Connection ~ 6350 5450
+Wire Wire Line
+	5700 5450 6450 5450
+Wire Wire Line
+	6700 6350 6700 6400
+Connection ~ 6700 5800
+Connection ~ 6700 4800
+Wire Wire Line
+	6700 6850 6700 6750
+Wire Wire Line
+	8150 4670 8150 4720
+Wire Wire Line
+	7900 2850 8500 2850
+Connection ~ 8500 2000
+Connection ~ 7250 1550
+Wire Wire Line
+	7650 1550 7250 1550
+Connection ~ 8750 4150
+Wire Wire Line
+	8900 4150 8650 4150
+Wire Wire Line
+	7650 4150 7595 4150
+Wire Wire Line
+	7595 4150 7595 3475
+Wire Wire Line
+	8350 9750 8350 10550
+Wire Wire Line
+	8050 9750 8050 10550
+Wire Wire Line
+	7750 9750 7750 10250
+Wire Wire Line
+	7450 9750 7450 10550
+Wire Wire Line
+	7150 9750 7150 10550
+Wire Wire Line
+	6850 9750 6850 10550
+Wire Wire Line
+	6550 9750 6550 10550
+Wire Wire Line
+	6250 9750 6250 10550
+Wire Wire Line
+	2050 7050 2400 7050
+Connection ~ 5050 8600
+Wire Wire Line
+	5050 8450 5050 8700
+Connection ~ 4250 8600
+Wire Wire Line
+	4700 8600 4700 8700
+Wire Wire Line
+	3500 8600 3400 8600
+Wire Wire Line
+	4250 8750 3950 8750
+Wire Wire Line
+	3950 8750 3950 8850
+Wire Wire Line
+	4250 9450 4250 9300
+Wire Wire Line
+	2300 9850 2300 9900
+Connection ~ 2300 9400
+Wire Wire Line
+	2300 9450 2300 8950
+Wire Wire Line
+	2400 8600 1800 8600
+Wire Wire Line
+	4300 5600 4300 5650
+Wire Wire Line
+	3650 5350 3700 5350
+Connection ~ 3700 5050
+Wire Wire Line
+	3700 5350 3700 5050
+Connection ~ 2050 5050
+Wire Wire Line
+	2050 4950 2050 5100
+Connection ~ 2600 5050
+Wire Wire Line
+	2600 5050 2600 5350
+Wire Wire Line
+	2600 5350 2650 5350
+Wire Wire Line
+	2050 5500 2050 5650
+Wire Wire Line
+	2650 5050 2050 5050
+Wire Wire Line
+	3150 5700 3150 5750
+Wire Wire Line
+	3750 5050 3650 5050
+Wire Wire Line
+	4150 5050 4300 5050
+Wire Wire Line
+	4300 4950 4300 5100
+Connection ~ 4300 5050
+Connection ~ 1800 8600
+Wire Wire Line
+	1800 8500 1800 8650
+Wire Wire Line
+	1800 9050 1800 9100
+Wire Wire Line
+	2300 8950 2400 8950
+Wire Wire Line
+	2200 9400 2300 9400
+Wire Wire Line
+	1700 9400 1250 9400
+Wire Wire Line
+	4250 9950 4250 10000
+Connection ~ 4250 9350
+Wire Wire Line
+	3950 9250 3950 9350
+Wire Wire Line
+	4250 8800 4250 8600
+Connection ~ 4250 8750
+Wire Wire Line
+	4250 9350 3600 9350
+Wire Wire Line
+	3600 9350 3600 8950
+Wire Wire Line
+	3600 8950 3400 8950
+Connection ~ 3950 9350
+Connection ~ 4700 8600
+Wire Wire Line
+	5050 9150 4700 9150
+Wire Wire Line
+	4700 9150 4700 9100
+Wire Wire Line
+	5050 9200 5050 9100
+Connection ~ 5050 9150
+Connection ~ 5050 6700
+Connection ~ 4250 6700
+Wire Wire Line
+	4700 6800 4700 6700
+Wire Wire Line
+	3500 6700 3400 6700
+Wire Wire Line
+	4250 6850 3950 6850
+Wire Wire Line
+	3950 6850 3950 6950
+Wire Wire Line
+	4250 7550 4250 7400
+Wire Wire Line
+	2400 6700 1800 6700
+Connection ~ 1800 6700
+Wire Wire Line
+	1800 6600 1800 6750
+Wire Wire Line
+	1800 7150 1800 7200
+Wire Wire Line
+	4250 8050 4250 8100
+Connection ~ 4250 7450
+Wire Wire Line
+	3950 7350 3950 7450
+Wire Wire Line
+	4250 6900 4250 6700
+Connection ~ 4250 6850
+Wire Wire Line
+	4250 7450 3600 7450
+Wire Wire Line
+	3600 7450 3600 7050
+Wire Wire Line
+	3600 7050 3400 7050
+Connection ~ 3950 7450
+Wire Wire Line
+	5050 6700 4100 6700
+Connection ~ 4700 6700
+Wire Wire Line
+	5050 7250 4700 7250
+Wire Wire Line
+	4700 7250 4700 7200
+Wire Wire Line
+	5050 7300 5050 7200
+Connection ~ 5050 7250
+Wire Wire Line
+	5050 6600 5050 6800
+Wire Wire Line
+	2900 7350 2900 7400
+Wire Wire Line
+	8750 4050 8750 4150
+Wire Wire Line
+	8750 3385 8750 3550
+Wire Wire Line
+	7250 1400 7250 2000
+Wire Wire Line
+	7250 2000 7400 2000
+Wire Wire Line
+	8500 1550 8150 1550
+Wire Wire Line
+	7900 2520 7900 2900
+Connection ~ 7900 2850
+Wire Wire Line
+	5950 7500 6700 7500
+Wire Wire Line
+	6700 7650 6700 7350
+Connection ~ 6700 7500
+Wire Wire Line
+	8500 2850 8500 2650
+Wire Wire Line
+	6700 8050 6700 8150
+Wire Wire Line
+	6350 4850 6350 4800
+Connection ~ 6700 6800
+Wire Wire Line
+	6700 5750 6700 5850
+Wire Wire Line
+	6350 5350 6350 5450
+Wire Wire Line
+	6350 4800 6700 4800
+Wire Wire Line
+	7400 5800 6700 5800
+Wire Wire Line
+	9100 2000 8400 2000
+Wire Wire Line
+	10400 5950 9850 5950
+Wire Wire Line
+	9850 5950 9850 5300
+Wire Wire Line
+	9650 5400 9650 5300
+Wire Wire Line
+	10400 6200 9900 6200
+Wire Wire Line
+	9900 6200 9900 6850
+Wire Wire Line
+	9900 6850 9800 6850
+Wire Wire Line
+	9200 6150 9200 6250
+Wire Wire Line
+	8800 6200 8800 6150
+Connection ~ 9200 6150
+Wire Wire Line
+	10400 6150 8550 6150
+Connection ~ 8800 6150
+Wire Wire Line
+	8150 6850 8000 6850
+Wire Wire Line
+	9250 6000 9250 5950
+Connection ~ 9650 6000
+Wire Wire Line
+	8650 5300 8500 5300
+Wire Wire Line
+	8650 6000 8500 6000
+Wire Wire Line
+	9050 6000 10400 6000
+Connection ~ 9250 6000
+Wire Wire Line
+	10400 6500 10000 6500
+Wire Wire Line
+	10300 6850 10400 6850
+Connection ~ 10300 6850
+Wire Wire Line
+	10300 6750 10400 6750
+Connection ~ 10300 6750
+Wire Wire Line
+	10200 6650 10400 6650
+Connection ~ 10300 6650
+Wire Wire Line
+	10300 7250 10400 7250
+Connection ~ 10300 7250
+Wire Wire Line
+	10300 7150 10400 7150
+Connection ~ 10300 7150
+Wire Wire Line
+	10200 7050 10400 7050
+Connection ~ 10300 7050
+Wire Wire Line
+	9250 7450 9250 7500
+Connection ~ 9250 7450
+Connection ~ 9250 8050
+Wire Wire Line
+	8750 7400 8750 7500
+Connection ~ 8750 7450
+Wire Wire Line
+	10300 7750 10400 7750
+Connection ~ 10300 7700
+Wire Wire Line
+	10300 7650 10300 8300
+Connection ~ 10300 8000
+Wire Wire Line
+	10000 8550 10000 8600
+Wire Wire Line
+	12250 6000 12650 6000
+Wire Wire Line
+	12250 6100 12650 6100
+Wire Wire Line
+	12250 6350 13150 6350
+Wire Wire Line
+	13150 6350 13150 6300
+Wire Wire Line
+	13300 5700 13300 5750
+Connection ~ 13300 5750
+Wire Wire Line
+	12300 7250 12250 7250
+Connection ~ 12300 7250
+Wire Wire Line
+	12300 7150 12250 7150
+Connection ~ 12300 7150
+Wire Wire Line
+	12300 7050 12250 7050
+Connection ~ 12300 7050
+Wire Wire Line
+	12300 6800 12250 6800
+Connection ~ 12300 6800
+Wire Wire Line
+	12300 6700 12250 6700
+Connection ~ 12300 6700
+Connection ~ 12300 6900
+Wire Wire Line
+	12300 6900 12400 6900
+Wire Wire Line
+	13100 7250 13100 7200
+Wire Wire Line
+	13900 7200 14000 7200
+Wire Wire Line
+	13300 7200 12550 7200
+Wire Wire Line
+	12550 7200 12550 7500
+Wire Wire Line
+	12550 7500 12250 7500
+Connection ~ 13100 7800
+Wire Wire Line
+	13100 8350 13100 8250
+Wire Wire Line
+	13100 7850 13100 7800
+Wire Wire Line
+	12250 7800 13300 7800
+Wire Wire Line
+	12800 7800 12800 7850
+Connection ~ 12800 7800
+Wire Wire Line
+	12250 7550 12350 7550
+Wire Wire Line
+	12350 8000 12250 8000
+Wire Wire Line
+	12350 7550 12350 8150
+Connection ~ 12350 8000
+Wire Wire Line
+	12450 7850 12450 7700
+Wire Wire Line
+	2900 9250 2900 9300
+Wire Wire Line
+	4900 2250 4900 2100
+Wire Wire Line
+	5350 2650 5300 2650
+Wire Wire Line
+	5300 2650 5300 2700
+Connection ~ 4900 2700
+Wire Wire Line
+	5300 2700 4700 2700
+Wire Wire Line
+	4700 2700 4700 2450
+Wire Wire Line
+	4700 2450 4400 2450
+Wire Wire Line
+	4550 2700 4400 2700
+Wire Wire Line
+	4650 3250 4550 3250
+Wire Wire Line
+	5650 3250 5750 3250
+Wire Wire Line
+	5750 3250 5750 3100
+Wire Wire Line
+	5100 3550 5200 3550
+Wire Wire Line
+	3000 1850 3000 2200
+Connection ~ 3000 2000
+Wire Wire Line
+	2450 2000 2500 2000
+Connection ~ 2450 1600
+Wire Wire Line
+	2950 1600 2450 1600
+Wire Wire Line
+	3300 1600 4650 1600
+Connection ~ 4650 2200
+Wire Wire Line
+	3200 2700 2650 2700
+Wire Wire Line
+	2650 2700 2650 2800
+Connection ~ 2950 2700
+Wire Wire Line
+	2650 3300 2650 3450
+Wire Wire Line
+	2400 3750 1700 3750
+Wire Wire Line
+	4650 1600 4650 2200
+Connection ~ 2500 2750
+Wire Wire Line
+	10200 7450 8750 7450
+Wire Wire Line
+	10350 8150 10350 8200
+Connection ~ 10350 8150
+Wire Wire Line
+	10350 8200 10400 8200
+Wire Wire Line
+	9050 3450 8750 3450
+Connection ~ 8750 3450
+Wire Notes Line
+	8950 10700 8950 9350
+Wire Notes Line
+	8950 10700 5900 10700
+Wire Notes Line
+	5900 10700 5900 9350
+Wire Notes Line
+	5900 9350 8950 9350
+Wire Notes Line
+	10600 1000 10600 5150
+Wire Wire Line
+	12150 9850 12150 10000
+Wire Wire Line
+	12150 10000 9650 10000
+Wire Wire Line
+	10650 10000 10650 9850
+Connection ~ 10650 10000
+Wire Wire Line
+	11650 10000 11650 9850
+Connection ~ 11650 10000
+Connection ~ 11150 9300
+Connection ~ 10150 9300
+Wire Wire Line
+	11650 9300 11650 9450
+Wire Wire Line
+	10650 9300 10650 9450
+Wire Wire Line
+	9650 10100 9650 9850
+Wire Notes Line
+	10600 1000 14800 1000
+Wire Notes Line
+	14800 1000 14800 5150
+Wire Notes Line
+	14800 5150 10600 5150
+Wire Wire Line
+	14600 5900 14050 5900
+Wire Wire Line
+	14600 6300 14450 6300
+Wire Wire Line
+	14450 6300 14450 6400
+Wire Wire Line
+	2100 2750 2100 2650
+Wire Wire Line
+	12950 6500 13050 6500
+Wire Wire Line
+	12350 6400 12250 6400
+Wire Wire Line
+	14500 7150 14950 7150
+Wire Wire Line
+	14950 7350 14650 7350
+Wire Wire Line
+	14650 7350 14650 7500
+NoConn ~ 14600 8850
+NoConn ~ 14800 8850
+NoConn ~ 15000 8850
+NoConn ~ 15200 8850
+NoConn ~ 15400 8850
+$Comp
+L HD H5
+U 1 1 4AABD9C0
+P 15400 8450
+F 0 "H5" H 15400 8500 60  0000 C C
+F 1 "HD" H 15400 8600 60  0000 C C
+	1    15400 8450
+	1    0    0    -1  
+$EndComp
+$Comp
+L HD H4
+U 1 1 4AABD9BE
+P 15200 8450
+F 0 "H4" H 15200 8500 60  0000 C C
+F 1 "HD" H 15200 8600 60  0000 C C
+	1    15200 8450
+	1    0    0    -1  
+$EndComp
+$Comp
+L HD H3
+U 1 1 4AABD9BB
+P 15000 8450
+F 0 "H3" H 15000 8500 60  0000 C C
+F 1 "HD" H 15000 8600 60  0000 C C
+	1    15000 8450
+	1    0    0    -1  
+$EndComp
+$Comp
+L HD H2
+U 1 1 4AABD9B8
+P 14800 8450
+F 0 "H2" H 14800 8500 60  0000 C C
+F 1 "HD" H 14800 8600 60  0000 C C
+	1    14800 8450
+	1    0    0    -1  
+$EndComp
+$Comp
+L HD H1
+U 1 1 4AABD9A9
+P 14600 8450
+F 0 "H1" H 14600 8500 60  0000 C C
+F 1 "HD" H 14600 8600 60  0000 C C
+	1    14600 8450
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR01
+U 1 1 4AABC832
+P 14650 7500
+F 0 "#PWR01" H 14650 7500 30  0001 C C
+F 1 "GND" H 14650 7430 30  0001 C C
+	1    14650 7500
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR02
+U 1 1 4AABC7DB
+P 14450 6400
+F 0 "#PWR02" H 14450 6400 30  0001 C C
+F 1 "GND" H 14450 6330 30  0001 C C
+	1    14450 6400
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR03
+U 1 1 4A6D2253
+P 14450 6400
+F 0 "#PWR03" H 14450 6400 30  0001 C C
+F 1 "GND" H 14450 6330 30  0001 C C
+	1    14450 6400
+	1    0    0    -1  
+$EndComp
+Text Label 14500 7250 0    30   ~
+BOOT_SEL1_HIGH
+Text Label 14500 7150 0    30   ~
+BOOT_SEL1
+$Comp
+L SWITCH SW1
+U 1 1 4AABC76A
+P 15400 7250
+F 0 "SW1" H 15400 7000 60  0000 C C
+F 1 "BOOT_SWITCH" H 15400 7500 60  0000 C C
+	1    15400 7250
+	1    0    0    -1  
+$EndComp
+Text Label 13450 6400 0    30   ~
+BOOT_SEL1_HIGH
+Text Label 12350 6400 0    30   ~
+BOOT_SEL1
+Kmarq B 2100 2650 "Warning: Pin power_out connected to Pin BiDi (net 2)" F=1
 Text Label 14100 5900 0    30   ~
 RXD
 Text Label 14100 6100 0    30   ~
@@ -702,15 +813,6 @@ KEYIN8
 Text GLabel 14050 6100 0    30   Input
 TXD
 $Comp
-L GND #PWR01
-U 1 1 4A6D2253
-P 14450 6400
-F 0 "#PWR01" H 14450 6400 30  0001 C C
-F 1 "GND" H 14450 6330 30  0001 C C
-	1    14450 6400
-	1    0    0    -1  
-$EndComp
-$Comp
 L SERIAL_CON CON3
 U 1 1 4A6D21E5
 P 14950 6100
@@ -720,10 +822,10 @@ F 1 "SERIAL_CON" H 14950 5750 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBUS #PWR02
+L VBUS #PWR04
 U 1 1 4A6C4171
 P 2500 2150
-F 0 "#PWR02" H 2500 2100 20  0001 C C
+F 0 "#PWR04" H 2500 2100 20  0001 C C
 F 1 "VBUS" H 2500 2250 30  0000 C C
 	1    2500 2150
 	1    0    0    -1  
@@ -735,19 +837,19 @@ F0 "POWER_TREE" 100
 F1 "power_tree.sch" 60
 $EndSheet
 $Comp
-L V33 #PWR03
+L V33 #PWR05
 U 1 1 4A69AE9E
 P 12800 9250
-F 0 "#PWR03" H 12800 9200 20  0001 C C
+F 0 "#PWR05" H 12800 9200 20  0001 C C
 F 1 "V33" H 12800 9350 30  0000 C C
 	1    12800 9250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR06
 U 1 1 4A69AE85
 P 12800 10100
-F 0 "#PWR04" H 12800 10100 30  0001 C C
+F 0 "#PWR06" H 12800 10100 30  0001 C C
 F 1 "GND" H 12800 10030 30  0001 C C
 	1    12800 10100
 	1    0    0    -1  
@@ -807,19 +909,19 @@ F 1 "10uF/10V" V 12950 9600 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L V18 #PWR05
+L V18 #PWR07
 U 1 1 4A69AE30
 P 9650 9250
-F 0 "#PWR05" H 9650 9200 20  0001 C C
+F 0 "#PWR07" H 9650 9200 20  0001 C C
 F 1 "V18" H 9650 9350 30  0000 C C
 	1    9650 9250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR08
 U 1 1 4A69AE06
 P 9650 10100
-F 0 "#PWR06" H 9650 10100 30  0001 C C
+F 0 "#PWR08" H 9650 10100 30  0001 C C
 F 1 "GND" H 9650 10030 30  0001 C C
 	1    9650 10100
 	1    0    0    -1  
@@ -906,10 +1008,10 @@ F 1 "JZ4720_186P" H 11400 8250 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG07
+L PWR_FLAG #FLG09
 U 1 1 4A49B972
 P 2100 2650
-F 0 "#FLG07" H 2100 2920 30  0001 C C
+F 0 "#FLG09" H 2100 2920 30  0001 C C
 F 1 "PWR_FLAG" H 2100 2880 30  0000 C C
 	1    2100 2650
 	1    0    0    -1  
@@ -921,37 +1023,37 @@ HIERARCHICAL SHEET
 Text Label 1700 3750 0    30   ~
 PW_ON_N
 $Comp
-L VBATO #PWR08
+L VBATO #PWR010
 U 1 1 4A48379C
 P 2450 1550
-F 0 "#PWR08" H 2450 1500 20  0001 C C
+F 0 "#PWR010" H 2450 1500 20  0001 C C
 F 1 "VBATO" H 2450 1650 30  0000 C C
 	1    2450 1550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR011
 U 1 1 4A483717
 P 2500 2800
-F 0 "#PWR09" H 2500 2800 30  0001 C C
+F 0 "#PWR011" H 2500 2800 30  0001 C C
 F 1 "GND" H 2500 2730 30  0001 C C
 	1    2500 2800
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBUS #PWR010
+L VBUS #PWR012
 U 1 1 4A48361D
 P 5750 3100
-F 0 "#PWR010" H 5750 3050 20  0001 C C
+F 0 "#PWR012" H 5750 3050 20  0001 C C
 F 1 "VBUS" H 5750 3200 30  0000 C C
 	1    5750 3100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR013
 U 1 1 4A483396
 P 2900 9300
-F 0 "#PWR011" H 2900 9300 30  0001 C C
+F 0 "#PWR013" H 2900 9300 30  0001 C C
 F 1 "GND" H 2900 9230 30  0001 C C
 	1    2900 9300
 	1    0    0    -1  
@@ -969,19 +1071,19 @@ F0 "MEMORY" 100
 F1 "memory.sch" 60
 $EndSheet
 $Comp
-L GND #PWR012
+L GND #PWR014
 U 1 1 4A4778EB
 P 13450 7000
-F 0 "#PWR012" H 13450 7000 30  0001 C C
+F 0 "#PWR014" H 13450 7000 30  0001 C C
 F 1 "GND" H 13450 6930 30  0001 C C
 	1    13450 7000
 	1    0    0    -1  
 $EndComp
 $Comp
-L VDDHP #PWR013
+L VDDHP #PWR015
 U 1 1 4A4778A9
 P 12450 7700
-F 0 "#PWR013" H 12450 7650 20  0001 C C
+F 0 "#PWR015" H 12450 7650 20  0001 C C
 F 1 "VDDHP" H 12450 7800 30  0000 C C
 	1    12450 7700
 	1    0    0    -1  
@@ -991,10 +1093,10 @@ VDDADC
 Text Label 12500 7800 0    30   ~
 VDDHP
 $Comp
-L GND #PWR014
+L GND #PWR016
 U 1 1 4A477817
 P 12350 8150
-F 0 "#PWR014" H 12350 8150 30  0001 C C
+F 0 "#PWR016" H 12350 8150 30  0001 C C
 F 1 "GND" H 12350 8080 30  0001 C C
 	1    12350 8150
 	1    0    0    -1  
@@ -1009,10 +1111,10 @@ F 1 "0.1uF/16V" V 12650 8000 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR015
+L GND #PWR017
 U 1 1 4A47773D
 P 13100 8350
-F 0 "#PWR015" H 13100 8350 30  0001 C C
+F 0 "#PWR017" H 13100 8350 30  0001 C C
 F 1 "GND" H 13100 8280 30  0001 C C
 	1    13100 8350
 	1    0    0    -1  
@@ -1036,19 +1138,19 @@ F 1 "10uF/10V" H 13150 7950 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR016
+L V33 #PWR018
 U 1 1 4A4776CC
 P 14000 7150
-F 0 "#PWR016" H 14000 7100 20  0001 C C
+F 0 "#PWR018" H 14000 7100 20  0001 C C
 F 1 "V33" H 14000 7250 30  0000 C C
 	1    14000 7150
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR019
 U 1 1 4A4776B3
 P 13100 7700
-F 0 "#PWR017" H 13100 7700 30  0001 C C
+F 0 "#PWR019" H 13100 7700 30  0001 C C
 F 1 "GND" H 13100 7630 30  0001 C C
 	1    13100 7700
 	1    0    0    -1  
@@ -1072,43 +1174,41 @@ F 1 "0.1uF/16V" H 13150 7350 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR020
 U 1 1 4A47760D
 P 12400 6900
-F 0 "#PWR018" H 12400 6900 30  0001 C C
+F 0 "#PWR020" H 12400 6900 30  0001 C C
 F 1 "GND" H 12400 6830 30  0001 C C
 	1    12400 6900
 	0    -1   -1   0   
 $EndComp
-Text Label 12350 6400 0    30   ~
-BOOT_SEL1
 Text Label 12350 6350 0    30   ~
 BOOT_SEL0
 $Comp
-L V33 #PWR019
+L V33 #PWR021
 U 1 1 4A4775B8
 P 13300 5700
-F 0 "#PWR019" H 13300 5650 20  0001 C C
+F 0 "#PWR021" H 13300 5650 20  0001 C C
 F 1 "V33" H 13300 5800 30  0000 C C
 	1    13300 5700
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR020
+L V33 #PWR022
 U 1 1 4A47758F
-P 13050 6450
-F 0 "#PWR020" H 13050 6400 20  0001 C C
-F 1 "V33" H 13050 6550 30  0000 C C
-	1    13050 6450
+P 13050 6500
+F 0 "#PWR022" H 13050 6450 20  0001 C C
+F 1 "V33" H 13050 6600 30  0000 C C
+	1    13050 6500
 	0    1    1    0   
 $EndComp
 $Comp
 L R R7
 U 1 1 4A4774E2
-P 12700 6450
-F 0 "R7" V 12800 6250 50  0000 C C
-F 1 "10K/5%" V 12800 6500 50  0000 C C
-	1    12700 6450
+P 12700 6500
+F 0 "R7" V 12800 6300 50  0000 C C
+F 1 "10K/5%" V 12800 6550 50  0000 C C
+	1    12700 6500
 	0    1    1    0   
 $EndComp
 $Comp
@@ -1204,10 +1304,10 @@ RCLKO
 Text Label 10100 5950 0    30   ~
 RCLK
 $Comp
-L GND #PWR021
+L GND #PWR023
 U 1 1 4A4772F5
 P 10000 8600
-F 0 "#PWR021" H 10000 8600 30  0001 C C
+F 0 "#PWR023" H 10000 8600 30  0001 C C
 F 1 "GND" H 10000 8530 30  0001 C C
 	1    10000 8600
 	1    0    0    -1  
@@ -1222,28 +1322,28 @@ F 1 "0.1uF/16V" V 10150 8300 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR024
 U 1 1 4A47729E
 P 10300 8300
-F 0 "#PWR022" H 10300 8300 30  0001 C C
+F 0 "#PWR024" H 10300 8300 30  0001 C C
 F 1 "GND" H 10300 8230 30  0001 C C
 	1    10300 8300
 	1    0    0    -1  
 $EndComp
 $Comp
-L V18 #PWR023
+L V18 #PWR025
 U 1 1 4A477261
 P 8750 7400
-F 0 "#PWR023" H 8750 7350 20  0001 C C
+F 0 "#PWR025" H 8750 7350 20  0001 C C
 F 1 "V18" H 8750 7500 30  0000 C C
 	1    8750 7400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR026
 U 1 1 4A477251
 P 9250 8100
-F 0 "#PWR024" H 9250 8100 30  0001 C C
+F 0 "#PWR026" H 9250 8100 30  0001 C C
 F 1 "GND" H 9250 8030 30  0001 C C
 	1    9250 8100
 	1    0    0    -1  
@@ -1276,19 +1376,19 @@ F 1 "0.01uF/16V" V 9900 7650 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L V18 #PWR025
+L V18 #PWR027
 U 1 1 4A477147
 P 10200 7050
-F 0 "#PWR025" H 10200 7000 20  0001 C C
+F 0 "#PWR027" H 10200 7000 20  0001 C C
 F 1 "V18" H 10200 7150 30  0000 C C
 	1    10200 7050
 	0    -1   -1   0   
 $EndComp
 $Comp
-L V33 #PWR026
+L V33 #PWR028
 U 1 1 4A477100
 P 10200 6650
-F 0 "#PWR026" H 10200 6600 20  0001 C C
+F 0 "#PWR028" H 10200 6600 20  0001 C C
 F 1 "V33" H 10200 6750 30  0000 C C
 	1    10200 6650
 	0    -1   -1   0   
@@ -1300,19 +1400,19 @@ PW_ON_N
 Text Label 10000 6400 0    30   ~
 RESETP_N
 $Comp
-L GND #PWR027
+L GND #PWR029
 U 1 1 4A47702C
 P 8500 5300
-F 0 "#PWR027" H 8500 5300 30  0001 C C
+F 0 "#PWR029" H 8500 5300 30  0001 C C
 F 1 "GND" H 8500 5230 30  0001 C C
 	1    8500 5300
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR028
+L GND #PWR030
 U 1 1 4A47702B
 P 8500 6000
-F 0 "#PWR028" H 8500 6000 30  0001 C C
+F 0 "#PWR030" H 8500 6000 30  0001 C C
 F 1 "GND" H 8500 5930 30  0001 C C
 	1    8500 6000
 	0    1    1    0   
@@ -1345,19 +1445,19 @@ F 1 "32768Hz" H 9250 5500 60  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR031
 U 1 1 4A476F85
 P 8000 6150
-F 0 "#PWR029" H 8000 6150 30  0001 C C
+F 0 "#PWR031" H 8000 6150 30  0001 C C
 F 1 "GND" H 8000 6080 30  0001 C C
 	1    8000 6150
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR032
 U 1 1 4A476F71
 P 8000 6850
-F 0 "#PWR030" H 8000 6850 30  0001 C C
+F 0 "#PWR032" H 8000 6850 30  0001 C C
 F 1 "GND" H 8000 6780 30  0001 C C
 	1    8000 6850
 	0    1    1    0   
@@ -1433,37 +1533,37 @@ PWEN
 Text Label 5700 5450 0    60   ~
 PW_ON_N
 $Comp
-L VRTC #PWR031
+L VRTC #PWR033
 U 1 1 4A449BF4
 P 6700 4750
-F 0 "#PWR031" H 6700 4700 20  0001 C C
+F 0 "#PWR033" H 6700 4700 20  0001 C C
 F 1 "VRTC" H 6700 4850 30  0000 C C
 	1    6700 4750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR034
 U 1 1 4A449B4B
 P 6700 6400
-F 0 "#PWR032" H 6700 6400 30  0001 C C
+F 0 "#PWR034" H 6700 6400 30  0001 C C
 F 1 "GND" H 6700 6330 30  0001 C C
 	1    6700 6400
 	1    0    0    -1  
 $EndComp
 $Comp
-L VRTC #PWR033
+L VRTC #PWR035
 U 1 1 4A4494A4
 P 6700 6750
-F 0 "#PWR033" H 6700 6700 20  0001 C C
+F 0 "#PWR035" H 6700 6700 20  0001 C C
 F 1 "VRTC" H 6700 6850 30  0000 C C
 	1    6700 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR034
+L GND #PWR036
 U 1 1 4A449463
 P 6700 8150
-F 0 "#PWR034" H 6700 8150 30  0001 C C
+F 0 "#PWR036" H 6700 8150 30  0001 C C
 F 1 "GND" H 6700 8080 30  0001 C C
 	1    6700 8150
 	1    0    0    -1  
@@ -1525,19 +1625,19 @@ F 1 "100K/5%" V 6450 5100 50  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR037
 U 1 1 4A4491DE
 P 8150 4720
-F 0 "#PWR035" H 8150 4720 30  0001 C C
+F 0 "#PWR037" H 8150 4720 30  0001 C C
 F 1 "GND" H 8150 4650 30  0001 C C
 	1    8150 4720
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR036
+L GND #PWR038
 U 1 1 4A449180
 P 7900 2900
-F 0 "#PWR036" H 7900 2900 30  0001 C C
+F 0 "#PWR038" H 7900 2900 30  0001 C C
 F 1 "GND" H 7900 2830 30  0001 C C
 	1    7900 2900
 	1    0    0    -1  
@@ -1545,10 +1645,10 @@ $EndComp
 Text Label 9100 2000 2    60   ~
 RESETP_N
 $Comp
-L VRTC #PWR037
+L VRTC #PWR039
 U 1 1 4A439D36
 P 7250 1400
-F 0 "#PWR037" H 7250 1350 20  0001 C C
+F 0 "#PWR039" H 7250 1350 20  0001 C C
 F 1 "VRTC" H 7250 1500 30  0000 C C
 	1    7250 1400
 	1    0    0    -1  
@@ -1565,19 +1665,19 @@ $EndComp
 Text GLabel 8900 4150 2    60   Output
 SHUTDOWN
 $Comp
-L V33 #PWR038
+L V33 #PWR040
 U 1 1 4A439AED
 P 8750 3385
-F 0 "#PWR038" H 8750 3335 20  0001 C C
+F 0 "#PWR040" H 8750 3335 20  0001 C C
 F 1 "V33" H 8750 3485 30  0000 C C
 	1    8750 3385
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBATO #PWR039
+L VBATO #PWR041
 U 1 1 4A4399D2
 P 7595 3475
-F 0 "#PWR039" H 7595 3425 20  0001 C C
+F 0 "#PWR041" H 7595 3425 20  0001 C C
 F 1 "VBATO" H 7595 3575 30  0000 C C
 	1    7595 3475
 	1    0    0    -1  
@@ -1705,19 +1805,19 @@ F 1 "TESTPOINT" V 6100 9500 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR042
 U 1 1 4A4240BA
 P 2900 7400
-F 0 "#PWR040" H 2900 7400 30  0001 C C
+F 0 "#PWR042" H 2900 7400 30  0001 C C
 F 1 "GND" H 2900 7330 30  0001 C C
 	1    2900 7400
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR041
+L V33 #PWR043
 U 1 1 4A424087
 P 5050 6600
-F 0 "#PWR041" H 5050 6550 20  0001 C C
+F 0 "#PWR043" H 5050 6550 20  0001 C C
 F 1 "V33" H 5050 6700 30  0000 C C
 	1    5050 6600
 	1    0    0    -1  
@@ -1725,19 +1825,19 @@ $EndComp
 Text Label 2050 7050 0    60   ~
 PWEN
 $Comp
-L GND #PWR042
+L GND #PWR044
 U 1 1 4A41ABF9
 P 5050 7300
-F 0 "#PWR042" H 5050 7300 30  0001 C C
+F 0 "#PWR044" H 5050 7300 30  0001 C C
 F 1 "GND" H 5050 7230 30  0001 C C
 	1    5050 7300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR043
+L GND #PWR045
 U 1 1 4A41ABF7
 P 4250 8100
-F 0 "#PWR043" H 4250 8100 30  0001 C C
+F 0 "#PWR045" H 4250 8100 30  0001 C C
 F 1 "GND" H 4250 8030 30  0001 C C
 	1    4250 8100
 	1    0    0    -1  
@@ -1797,10 +1897,10 @@ F 1 "4.7uH/1A" V 3700 6700 40  0000 C C
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VBATO #PWR044
+L VBATO #PWR046
 U 1 1 4A41ABED
 P 1800 6600
-F 0 "#PWR044" H 1800 6550 20  0001 C C
+F 0 "#PWR046" H 1800 6550 20  0001 C C
 F 1 "VBATO" H 1800 6700 30  0000 C C
 	1    1800 6600
 	1    0    0    -1  
@@ -1815,10 +1915,10 @@ F 1 "10uF/10V" V 1600 6950 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR045
+L GND #PWR047
 U 1 1 4A41ABEB
 P 1800 7200
-F 0 "#PWR045" H 1800 7200 30  0001 C C
+F 0 "#PWR047" H 1800 7200 30  0001 C C
 F 1 "GND" H 1800 7130 30  0001 C C
 	1    1800 7200
 	1    0    0    -1  
@@ -1833,28 +1933,28 @@ F 1 "EUP3406" H 2900 7350 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR046
+L GND #PWR048
 U 1 1 4A41AB82
 P 5050 9200
-F 0 "#PWR046" H 5050 9200 30  0001 C C
+F 0 "#PWR048" H 5050 9200 30  0001 C C
 F 1 "GND" H 5050 9130 30  0001 C C
 	1    5050 9200
 	1    0    0    -1  
 $EndComp
 $Comp
-L V18 #PWR047
+L V18 #PWR049
 U 1 1 4A41AA38
 P 5050 8450
-F 0 "#PWR047" H 5050 8400 20  0001 C C
+F 0 "#PWR049" H 5050 8400 20  0001 C C
 F 1 "V18" H 5050 8550 30  0000 C C
 	1    5050 8450
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR048
+L GND #PWR050
 U 1 1 4A41A954
 P 4250 10000
-F 0 "#PWR048" H 4250 10000 30  0001 C C
+F 0 "#PWR050" H 4250 10000 30  0001 C C
 F 1 "GND" H 4250 9930 30  0001 C C
 	1    4250 10000
 	1    0    0    -1  
@@ -1916,10 +2016,10 @@ $EndComp
 Text Label 1250 9400 0    60   ~
 PWEN
 $Comp
-L GND #PWR049
+L GND #PWR051
 U 1 1 4A41A40E
 P 2300 9900
-F 0 "#PWR049" H 2300 9900 30  0001 C C
+F 0 "#PWR051" H 2300 9900 30  0001 C C
 F 1 "GND" H 2300 9830 30  0001 C C
 	1    2300 9900
 	1    0    0    -1  
@@ -1943,10 +2043,10 @@ F 1 "0.1uF/16V" H 2350 9550 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBATO #PWR050
+L VBATO #PWR052
 U 1 1 4A41A1FC
 P 1800 8500
-F 0 "#PWR050" H 1800 8450 20  0001 C C
+F 0 "#PWR052" H 1800 8450 20  0001 C C
 F 1 "VBATO" H 1800 8600 30  0000 C C
 	1    1800 8500
 	1    0    0    -1  
@@ -1961,10 +2061,10 @@ F 1 "10uF/10V" H 1850 8750 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR053
 U 1 1 4A41A1FA
 P 1800 9100
-F 0 "#PWR051" H 1800 9100 30  0001 C C
+F 0 "#PWR053" H 1800 9100 30  0001 C C
 F 1 "GND" H 1800 9030 30  0001 C C
 	1    1800 9100
 	1    0    0    -1  
@@ -1979,19 +2079,19 @@ F 1 "EUP3406" H 2900 9250 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L VRTC #PWR052
+L VRTC #PWR054
 U 1 1 4A4187DC
 P 4300 4950
-F 0 "#PWR052" H 4300 4900 20  0001 C C
+F 0 "#PWR054" H 4300 4900 20  0001 C C
 F 1 "VRTC" H 4300 5050 30  0000 C C
 	1    4300 4950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR053
+L GND #PWR055
 U 1 1 4A4185EC
 P 4300 5650
-F 0 "#PWR053" H 4300 5650 30  0001 C C
+F 0 "#PWR055" H 4300 5650 30  0001 C C
 F 1 "GND" H 4300 5580 30  0001 C C
 	1    4300 5650
 	1    0    0    -1  
@@ -2006,19 +2106,19 @@ F 1 "47uF/6.3V" H 4600 5200 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBATO #PWR054
+L VBATO #PWR056
 U 1 1 4A4180FD
 P 2050 4950
-F 0 "#PWR054" H 2050 4900 20  0001 C C
+F 0 "#PWR056" H 2050 4900 20  0001 C C
 F 1 "VBATO" H 2050 5050 30  0000 C C
 	1    2050 4950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR055
+L GND #PWR057
 U 1 1 4A4180C5
 P 3150 5750
-F 0 "#PWR055" H 3150 5750 30  0001 C C
+F 0 "#PWR057" H 3150 5750 30  0001 C C
 F 1 "GND" H 3150 5680 30  0001 C C
 	1    3150 5750
 	1    0    0    -1  
@@ -2033,10 +2133,10 @@ F 1 "1uF/16V" H 2100 5200 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR056
+L GND #PWR058
 U 1 1 4A417FAE
 P 2050 5650
-F 0 "#PWR056" H 2050 5650 30  0001 C C
+F 0 "#PWR058" H 2050 5650 30  0001 C C
 F 1 "GND" H 2050 5580 30  0001 C C
 	1    2050 5650
 	1    0    0    -1  
@@ -2073,10 +2173,10 @@ F 1 "TM2301N" V 3050 1225 60  0000 C C
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VBAT #PWR057
+L VBAT #PWR059
 U 1 1 4A40E2E1
 P 4900 2100
-F 0 "#PWR057" H 4900 2050 20  0001 C C
+F 0 "#PWR059" H 4900 2050 20  0001 C C
 F 1 "VBAT" H 4900 2200 30  0000 C C
 	1    4900 2100
 	1    0    0    -1  
@@ -2138,10 +2238,10 @@ F 1 "2.5K/5%" H 2400 2950 50  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR058
+L GND #PWR060
 U 1 1 4A4042AB
 P 2650 3950
-F 0 "#PWR058" H 2650 3950 30  0001 C C
+F 0 "#PWR060" H 2650 3950 30  0001 C C
 F 1 "GND" H 2650 3880 30  0001 C C
 	1    2650 3950
 	1    0    0    -1  
@@ -2183,10 +2283,10 @@ F 1 "SE9016" H 3800 2850 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR059
+L GND #PWR061
 U 1 1 4A3F40C0
 P 4900 2750
-F 0 "#PWR059" H 4900 2750 30  0001 C C
+F 0 "#PWR061" H 4900 2750 30  0001 C C
 F 1 "GND" H 4900 2680 30  0001 C C
 	1    4900 2750
 	1    0    0    -1  
diff --git a/main/audio.sch b/main/audio.sch
old mode 100755
new mode 100644
index a5d14bc..ed0b220
--- a/main/audio.sch
+++ b/main/audio.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,./Qi_AVT2.cache
+LIBS:power,../components/boot_switch,../components/hd,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
@@ -100,20 +100,6 @@ Wire Wire Line
 	6550 5400 7250 5400
 Wire Wire Line
 	7250 5400 7250 5300
-Wire Wire Line
-	9500 6250 8900 6250
-Wire Wire Line
-	9500 6100 8900 6100
-Wire Wire Line
-	9500 5950 8900 5950
-Wire Wire Line
-	9500 5800 8900 5800
-Wire Wire Line
-	9500 5650 8900 5650
-Wire Wire Line
-	9500 5500 8900 5500
-Wire Wire Line
-	9500 5350 8900 5350
 Wire Wire Line
 	6550 5600 6850 5600
 Wire Wire Line
@@ -224,10 +210,10 @@ F 1 "100uF/4V" V 2600 2100 60  0000 C C
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR0107
+L GND #PWR0109
 U 1 1 4A46E97D
 P 3200 3550
-F 0 "#PWR0107" H 3200 3550 30  0001 C C
+F 0 "#PWR0109" H 3200 3550 30  0001 C C
 F 1 "GND" H 3200 3480 30  0001 C C
 	1    3200 3550
 	1    0    0    -1  
@@ -291,10 +277,10 @@ F 1 "33/5%" V 5350 2550 50  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L V33 #PWR0108
+L V33 #PWR0110
 U 1 1 4A46E6A6
 P 6300 1750
-F 0 "#PWR0108" H 6300 1700 20  0001 C C
+F 0 "#PWR0110" H 6300 1700 20  0001 C C
 F 1 "V33" H 6300 1850 30  0000 C C
 	1    6300 1750
 	1    0    0    -1  
@@ -302,10 +288,10 @@ $EndComp
 Text Label 5900 2500 0    30   ~
 AMPIN
 $Comp
-L GND #PWR0109
+L GND #PWR0111
 U 1 1 4A46E629
 P 6300 3400
-F 0 "#PWR0109" H 6300 3400 30  0001 C C
+F 0 "#PWR0111" H 6300 3400 30  0001 C C
 F 1 "GND" H 6300 3330 30  0001 C C
 	1    6300 3400
 	1    0    0    -1  
@@ -348,10 +334,10 @@ MICIN
 Text Label 8550 3000 0    60   ~
 MICIN
 $Comp
-L GND #PWR0110
+L GND #PWR0112
 U 1 1 4A46E225
 P 9150 2700
-F 0 "#PWR0110" H 9150 2700 30  0001 C C
+F 0 "#PWR0112" H 9150 2700 30  0001 C C
 F 1 "GND" H 9150 2630 30  0001 C C
 	1    9150 2700
 	1    0    0    -1  
@@ -366,10 +352,10 @@ F 1 "0.1uF/16V" V 9550 2200 50  0000 L C
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR0111
+L GND #PWR0113
 U 1 1 4A46E19D
 P 10150 3300
-F 0 "#PWR0111" H 10150 3300 30  0001 C C
+F 0 "#PWR0113" H 10150 3300 30  0001 C C
 F 1 "GND" H 10150 3230 30  0001 C C
 	1    10150 3300
 	1    0    0    -1  
@@ -432,10 +418,10 @@ AMPEN
 Text Label 1950 5700 0    60   ~
 AMPIN
 $Comp
-L GND #PWR0112
+L GND #PWR0114
 U 1 1 4A46DFA2
 P 3050 5400
-F 0 "#PWR0112" H 3050 5400 30  0001 C C
+F 0 "#PWR0114" H 3050 5400 30  0001 C C
 F 1 "GND" H 3050 5330 30  0001 C C
 	1    3050 5400
 	1    0    0    -1  
@@ -459,10 +445,10 @@ F 1 "100K/5%" V 2950 5050 50  0000 C C
 	-1   0    0    1   
 $EndComp
 $Comp
-L VBATO #PWR0113
+L VBATO #PWR0115
 U 1 1 4A46DE09
 P 3600 4650
-F 0 "#PWR0113" H 3600 4600 20  0001 C C
+F 0 "#PWR0115" H 3600 4600 20  0001 C C
 F 1 "VBATO" H 3600 4750 30  0000 C C
 	1    3600 4650
 	1    0    0    -1  
@@ -477,10 +463,10 @@ F 1 "PZ1608D221" V 4100 4700 40  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR0114
+L GND #PWR0116
 U 1 1 4A46DD3A
 P 4700 5350
-F 0 "#PWR0114" H 4700 5350 30  0001 C C
+F 0 "#PWR0116" H 4700 5350 30  0001 C C
 F 1 "GND" H 4700 5280 30  0001 C C
 	1    4700 5350
 	1    0    0    -1  
@@ -504,10 +490,10 @@ F 1 "0.1uF/16V" V 4400 5700 50  0000 L C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR0115
+L GND #PWR0117
 U 1 1 4A46DBD2
 P 6850 6550
-F 0 "#PWR0115" H 6850 6550 30  0001 C C
+F 0 "#PWR0117" H 6850 6550 30  0001 C C
 F 1 "GND" H 6850 6480 30  0001 C C
 	1    6850 6550
 	1    0    0    -1  
@@ -566,81 +552,4 @@ F 1 "SOLDERPASTE" H 7450 5300 60  0001 C C
 	1    7450 5300
 	0    1    1    0   
 $EndComp
-Text Label 8900 6250 0    60   ~
-HPRO
-$Comp
-L TESTPOINT TP58
-U 1 1 4A46D872
-P 9550 6250
-F 0 "TP58" V 9550 6600 60  0000 C C
-F 1 "TESTPOINT" H 9550 6250 60  0001 C C
-	1    9550 6250
-	0    1    1    0   
-$EndComp
-Text Label 8900 6100 0    60   ~
-HPLO
-$Comp
-L TESTPOINT TP57
-U 1 1 4A46D871
-P 9550 6100
-F 0 "TP57" V 9550 6450 60  0000 C C
-F 1 "TESTPOINT" H 9550 6100 60  0001 C C
-	1    9550 6100
-	0    1    1    0   
-$EndComp
-Text Label 8900 5950 0    60   ~
-AMPEN
-$Comp
-L TESTPOINT TP56
-U 1 1 4A46D870
-P 9550 5950
-F 0 "TP56" V 9550 6300 60  0000 C C
-F 1 "TESTPOINT" H 9550 5950 60  0001 C C
-	1    9550 5950
-	0    1    1    0   
-$EndComp
-Text Label 8900 5800 0    60   ~
-HPGND
-$Comp
-L TESTPOINT TP55
-U 1 1 4A46D869
-P 9550 5800
-F 0 "TP55" V 9550 6150 60  0000 C C
-F 1 "TESTPOINT" H 9550 5800 60  0001 C C
-	1    9550 5800
-	0    1    1    0   
-$EndComp
-Text Label 8900 5650 0    60   ~
-HPOR
-$Comp
-L TESTPOINT TP54
-U 1 1 4A46D868
-P 9550 5650
-F 0 "TP54" V 9550 6000 60  0000 C C
-F 1 "TESTPOINT" H 9550 5650 60  0001 C C
-	1    9550 5650
-	0    1    1    0   
-$EndComp
-Text Label 8900 5500 0    60   ~
-HPOL
-$Comp
-L TESTPOINT TP53
-U 1 1 4A46D860
-P 9550 5500
-F 0 "TP53" V 9550 5850 60  0000 C C
-F 1 "TESTPOINT" H 9550 5500 60  0001 C C
-	1    9550 5500
-	0    1    1    0   
-$EndComp
-Text Label 8900 5350 0    60   ~
-POP
-$Comp
-L TESTPOINT TP24
-U 1 1 4A4631B5
-P 9550 5350
-F 0 "TP24" V 9550 5700 60  0000 C C
-F 1 "TESTPOINT" H 9550 5350 60  0001 C C
-	1    9550 5350
-	0    1    1    0   
-$EndComp
 $EndSCHEMATC
diff --git a/main/function_block.sch b/main/function_block.sch
old mode 100755
new mode 100644
index 7024349..6e3c0b0
--- a/main/function_block.sch
+++ b/main/function_block.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,./Qi_AVT2.cache
+LIBS:power,../components/boot_switch,../components/hd,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/key_matrix.sch b/main/key_matrix.sch
old mode 100755
new mode 100644
index 011576f..396d62c
--- a/main/key_matrix.sch
+++ b/main/key_matrix.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,./Qi_AVT2.cache
+LIBS:power,../components/boot_switch,../components/hd,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
@@ -418,38 +418,10 @@ Wire Wire Line
 	7700 1650 7700 5650
 Wire Wire Line
 	9300 1650 9300 5650
-Wire Wire Line
-	2150 4800 1550 4800
-Wire Wire Line
-	2150 4650 1550 4650
-Wire Wire Line
-	2150 4500 1550 4500
-Wire Wire Line
-	2150 4350 1550 4350
-Wire Wire Line
-	2150 4200 1550 4200
-Wire Wire Line
-	2150 4050 1550 4050
-Wire Wire Line
-	2150 3900 1550 3900
-Wire Wire Line
-	2150 3750 1550 3750
 Wire Wire Line
 	2150 3600 1550 3600
 Wire Wire Line
 	2150 3450 1550 3450
-Wire Wire Line
-	2150 3300 1550 3300
-Wire Wire Line
-	2150 3150 1550 3150
-Wire Wire Line
-	2150 3000 1550 3000
-Wire Wire Line
-	2150 2850 1550 2850
-Wire Wire Line
-	2150 2700 1550 2700
-Wire Wire Line
-	2150 2550 1550 2550
 Wire Wire Line
 	4500 6200 4500 1650
 Wire Wire Line
@@ -1259,101 +1231,13 @@ F 1 "SW_METALDOMN" H 5800 2300 60  0001 C C
 	1    5800 2350
 	1    0    0    -1  
 $EndComp
-Text Label 2150 4800 2    60   ~
-KEYIN8
-$Comp
-L TESTPOINT TP74
-U 1 1 4A4632AB
-P 1500 4800
-F 0 "TP74" V 1500 5150 60  0000 C C
-F 1 "TESTPOINT" H 1500 4800 60  0001 C C
-	1    1500 4800
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 4650 2    60   ~
-KEYIN7
-$Comp
-L TESTPOINT TP73
-U 1 1 4A4632AA
-P 1500 4650
-F 0 "TP73" V 1500 5000 60  0000 C C
-F 1 "TESTPOINT" H 1500 4650 60  0001 C C
-	1    1500 4650
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 4500 2    60   ~
-KEYIN6
-$Comp
-L TESTPOINT TP72
-U 1 1 4A4632A9
-P 1500 4500
-F 0 "TP72" V 1500 4850 60  0000 C C
-F 1 "TESTPOINT" H 1500 4500 60  0001 C C
-	1    1500 4500
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 4350 2    60   ~
-KEYIN5
-$Comp
-L TESTPOINT TP71
-U 1 1 4A4632A8
-P 1500 4350
-F 0 "TP71" V 1500 4700 60  0000 C C
-F 1 "TESTPOINT" H 1500 4350 60  0001 C C
-	1    1500 4350
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 4200 2    60   ~
-KEYIN4
-$Comp
-L TESTPOINT TP70
-U 1 1 4A4632A7
-P 1500 4200
-F 0 "TP70" V 1500 4550 60  0000 C C
-F 1 "TESTPOINT" H 1500 4200 60  0001 C C
-	1    1500 4200
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 4050 2    60   ~
+Text Label 2150 3600 2    60   ~
 KEYIN3
 $Comp
 L TESTPOINT TP69
 U 1 1 4A4632A6
-P 1500 4050
-F 0 "TP69" V 1500 4400 60  0000 C C
-F 1 "TESTPOINT" H 1500 4050 60  0001 C C
-	1    1500 4050
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 3900 2    60   ~
-KEYIN2
-$Comp
-L TESTPOINT TP68
-U 1 1 4A4632A5
-P 1500 3900
-F 0 "TP68" V 1500 4250 60  0000 C C
-F 1 "TESTPOINT" H 1500 3900 60  0001 C C
-	1    1500 3900
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 3750 2    60   ~
-KEYIN1
-$Comp
-L TESTPOINT TP67
-U 1 1 4A4632A4
-P 1500 3750
-F 0 "TP67" V 1500 4100 60  0000 C C
-F 1 "TESTPOINT" H 1500 3750 60  0001 C C
-	1    1500 3750
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 3600 2    60   ~
-KEYOUT8
-$Comp
-L TESTPOINT TP66
-U 1 1 4A46329D
 P 1500 3600
-F 0 "TP66" V 1500 3950 60  0000 C C
+F 0 "TP69" V 1500 3950 60  0000 C C
 F 1 "TESTPOINT" H 1500 3600 60  0001 C C
 	1    1500 3600
 	0    -1   -1   0   
@@ -1369,70 +1253,4 @@ F 1 "TESTPOINT" H 1500 3450 60  0001 C C
 	1    1500 3450
 	0    -1   -1   0   
 $EndComp
-Text Label 2150 3300 2    60   ~
-KEYOUT6
-$Comp
-L TESTPOINT TP64
-U 1 1 4A46329B
-P 1500 3300
-F 0 "TP64" V 1500 3650 60  0000 C C
-F 1 "TESTPOINT" H 1500 3300 60  0001 C C
-	1    1500 3300
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 3150 2    60   ~
-KEYOUT5
-$Comp
-L TESTPOINT TP63
-U 1 1 4A46329A
-P 1500 3150
-F 0 "TP63" V 1500 3500 60  0000 C C
-F 1 "TESTPOINT" H 1500 3150 60  0001 C C
-	1    1500 3150
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 3000 2    60   ~
-KEYOUT4
-$Comp
-L TESTPOINT TP62
-U 1 1 4A463292
-P 1500 3000
-F 0 "TP62" V 1500 3350 60  0000 C C
-F 1 "TESTPOINT" H 1500 3000 60  0001 C C
-	1    1500 3000
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 2850 2    60   ~
-KEYOUT3
-$Comp
-L TESTPOINT TP61
-U 1 1 4A463291
-P 1500 2850
-F 0 "TP61" V 1500 3200 60  0000 C C
-F 1 "TESTPOINT" H 1500 2850 60  0001 C C
-	1    1500 2850
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 2700 2    60   ~
-KEYOUT2
-$Comp
-L TESTPOINT TP60
-U 1 1 4A46328B
-P 1500 2700
-F 0 "TP60" V 1500 3050 60  0000 C C
-F 1 "TESTPOINT" H 1500 2700 60  0001 C C
-	1    1500 2700
-	0    -1   -1   0   
-$EndComp
-Text Label 2150 2550 2    60   ~
-KEYOUT1
-$Comp
-L TESTPOINT TP59
-U 1 1 4A4631B5
-P 1500 2550
-F 0 "TP59" V 1500 2900 60  0000 C C
-F 1 "TESTPOINT" H 1500 2550 60  0001 C C
-	1    1500 2550
-	0    -1   -1   0   
-$EndComp
 $EndSCHEMATC
diff --git a/main/lcd_usb.sch b/main/lcd_usb.sch
old mode 100755
new mode 100644
index 54d0d7b..7158dbb
--- a/main/lcd_usb.sch
+++ b/main/lcd_usb.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,./Qi_AVT2.cache
+LIBS:power,../components/boot_switch,../components/hd,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
@@ -302,36 +302,6 @@ Wire Wire Line
 	2000 1100 2000 1050
 Wire Wire Line
 	2000 1050 2100 1050
-Wire Wire Line
-	3100 4000 3100 4450
-Wire Wire Line
-	2950 4000 2950 4450
-Wire Wire Line
-	2800 4000 2800 4450
-Wire Wire Line
-	2650 4000 2650 4450
-Wire Wire Line
-	2500 4000 2500 4450
-Wire Wire Line
-	2350 4000 2350 4450
-Wire Wire Line
-	3700 4000 3700 4450
-Wire Wire Line
-	3550 4000 3550 4450
-Wire Wire Line
-	3400 4000 3400 4450
-Wire Wire Line
-	3250 4000 3250 4450
-Wire Wire Line
-	2200 4000 2200 4450
-Wire Wire Line
-	2050 4000 2050 4450
-Wire Wire Line
-	1900 4000 1900 4450
-Wire Wire Line
-	1750 4000 1750 4450
-Wire Wire Line
-	1600 4000 1600 4450
 Wire Wire Line
 	2100 850  1700 850 
 Wire Wire Line
@@ -550,10 +520,6 @@ Wire Wire Line
 	2750 5400 2350 5400
 Wire Wire Line
 	3950 2750 4400 2750
-Wire Wire Line
-	1450 4000 1450 4450
-Wire Wire Line
-	1300 4000 1300 4450
 Connection ~ 10300 6050
 Wire Wire Line
 	10300 6650 10300 6750
@@ -617,12 +583,6 @@ Wire Wire Line
 	3950 2150 4350 2150
 Wire Wire Line
 	3950 2250 4350 2250
-Wire Wire Line
-	1150 4000 1150 4450
-Wire Wire Line
-	1000 4000 1000 4450
-Wire Wire Line
-	850  4000 850  4450
 Wire Wire Line
 	7400 5100 7400 5200
 Wire Wire Line
@@ -643,39 +603,6 @@ F 1 "MSCD104" H 7400 5100 40  0000 C C
 $EndComp
 Text Label 7800 5150 0    30   ~
 VHOST
-Text Label 850  4450 1    30   ~
-VHOST
-$Comp
-L TESTPOINT TP85
-U 1 1 4A837BD1
-P 850 3950
-F 0 "TP85" V 850 4150 30  0000 C C
-F 1 "TESTPOINT" H 850 3950 60  0001 C C
-	1    850  3950
-	1    0    0    -1  
-$EndComp
-Text Label 1000 4450 1    30   ~
-XN
-$Comp
-L TESTPOINT TP84
-U 1 1 4A7F79CA
-P 1000 3950
-F 0 "TP84" V 1000 4150 30  0000 C C
-F 1 "TESTPOINT" H 1000 3950 60  0001 C C
-	1    1000 3950
-	1    0    0    -1  
-$EndComp
-Text Label 1150 4450 1    30   ~
-YN
-$Comp
-L TESTPOINT TP83
-U 1 1 4A7F79C9
-P 1150 3950
-F 0 "TP83" V 1150 4150 30  0000 C C
-F 1 "TESTPOINT" H 1150 3950 60  0001 C C
-	1    1150 3950
-	1    0    0    -1  
-$EndComp
 Text Label 4350 2250 2    30   ~
 XN
 Text Label 4350 2200 2    30   ~
@@ -694,10 +621,10 @@ F 1 "1M/5%" V 5450 2100 50  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR060
+L GND #PWR062
 U 1 1 4A7C23A5
 P 5200 2200
-F 0 "#PWR060" H 5200 2200 30  0001 C C
+F 0 "#PWR062" H 5200 2200 30  0001 C C
 F 1 "GND" H 5200 2130 30  0001 C C
 	1    5200 2200
 	0    -1   -1   0   
@@ -725,19 +652,19 @@ F 1 "1M/5%" V 5600 4700 50  0000 C C
 	1    0    0    1   
 $EndComp
 $Comp
-L VBATO #PWR061
+L VBATO #PWR063
 U 1 1 4A7C160E
 P 5300 4400
-F 0 "#PWR061" H 5300 4350 20  0001 C C
+F 0 "#PWR063" H 5300 4350 20  0001 C C
 F 1 "VBATO" H 5300 4500 30  0000 C C
 	1    5300 4400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR062
+L GND #PWR064
 U 1 1 4A7C12A3
 P 5300 5200
-F 0 "#PWR062" H 5300 5200 30  0001 C C
+F 0 "#PWR064" H 5300 5200 30  0001 C C
 F 1 "GND" H 5300 5130 30  0001 C C
 	1    5300 5200
 	1    0    0    -1  
@@ -752,10 +679,10 @@ F 1 "3.3uF/16V" V 5100 4800 50  0000 L C
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR063
+L GND #PWR065
 U 1 1 4A7C10ED
 P 7400 5700
-F 0 "#PWR063" H 7400 5700 30  0001 C C
+F 0 "#PWR065" H 7400 5700 30  0001 C C
 F 1 "GND" H 7400 5630 30  0001 C C
 	1    7400 5700
 	1    0    0    -1  
@@ -828,19 +755,19 @@ F 1 "MSCD104" H 9650 5500 40  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR064
+L GND #PWR066
 U 1 1 4A7BDE77
 P 9650 6750
-F 0 "#PWR064" H 9650 6750 30  0001 C C
+F 0 "#PWR066" H 9650 6750 30  0001 C C
 F 1 "GND" H 9650 6680 30  0001 C C
 	1    9650 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR065
+L GND #PWR067
 U 1 1 4A7BDDC0
 P 10000 6750
-F 0 "#PWR065" H 10000 6750 30  0001 C C
+F 0 "#PWR067" H 10000 6750 30  0001 C C
 F 1 "GND" H 10000 6680 30  0001 C C
 	1    10000 6750
 	1    0    0    -1  
@@ -855,10 +782,10 @@ F 1 "100K/5%" V 9900 6400 50  0000 C C
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR066
+L GND #PWR068
 U 1 1 4A7BDCBC
 P 10300 6750
-F 0 "#PWR066" H 10300 6750 30  0001 C C
+F 0 "#PWR068" H 10300 6750 30  0001 C C
 F 1 "GND" H 10300 6680 30  0001 C C
 	1    10300 6750
 	1    0    0    -1  
@@ -894,28 +821,6 @@ Text Label 4400 2750 2    30   ~
 HOST_DM1
 Text Label 4400 2700 2    30   ~
 HOST_DP1
-Text Label 1300 4450 1    30   ~
-YP
-$Comp
-L TESTPOINT TP82
-U 1 1 4A6C6E45
-P 1300 3950
-F 0 "TP82" V 1300 4150 30  0000 C C
-F 1 "TESTPOINT" H 1300 3950 60  0001 C C
-	1    1300 3950
-	1    0    0    -1  
-$EndComp
-Text Label 1450 4450 1    30   ~
-XP
-$Comp
-L TESTPOINT TP81
-U 1 1 4A6C6E3C
-P 1450 3950
-F 0 "TP81" V 1450 4150 30  0000 C C
-F 1 "TESTPOINT" H 1450 3950 60  0001 C C
-	1    1450 3950
-	1    0    0    -1  
-$EndComp
 Text Notes 1800 850  0    60   ~
 2mA
 Text GLabel 2750 5400 2    30   Output
@@ -927,10 +832,10 @@ GPC9
 Text Label 6550 1700 0    30   ~
 GPC8
 $Comp
-L V33 #PWR067
+L V33 #PWR069
 U 1 1 4A48317A
 P 6950 950
-F 0 "#PWR067" H 6950 900 20  0001 C C
+F 0 "#PWR069" H 6950 900 20  0001 C C
 F 1 "V33" H 6950 1050 30  0000 C C
 	1    6950 950 
 	1    0    0    -1  
@@ -938,10 +843,10 @@ $EndComp
 NoConn ~ 7050 1650
 NoConn ~ 7500 1700
 $Comp
-L GND #PWR068
+L GND #PWR070
 U 1 1 4A48314F
 P 8000 1800
-F 0 "#PWR068" H 8000 1800 30  0001 C C
+F 0 "#PWR070" H 8000 1800 30  0001 C C
 F 1 "GND" H 8000 1730 30  0001 C C
 	1    8000 1800
 	1    0    0    -1  
@@ -1041,19 +946,19 @@ F 1 "33/5%" H 8650 3800 40  0000 C C
 	-1   0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR069
+L V33 #PWR071
 U 1 1 4A482DB2
 P 9650 2100
-F 0 "#PWR069" H 9650 2050 20  0001 C C
+F 0 "#PWR071" H 9650 2050 20  0001 C C
 F 1 "V33" H 9650 2200 30  0000 C C
 	1    9650 2100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR070
+L GND #PWR072
 U 1 1 4A482D97
 P 9850 2700
-F 0 "#PWR070" H 9850 2700 30  0001 C C
+F 0 "#PWR072" H 9850 2700 30  0001 C C
 F 1 "GND" H 9850 2630 30  0001 C C
 	1    9850 2700
 	1    0    0    -1  
@@ -1074,19 +979,19 @@ LCDSCL
 Text GLabel 9650 3800 0    30   Input
 LCDSDA
 $Comp
-L GND #PWR071
+L GND #PWR073
 U 1 1 4A482D03
 P 9700 4050
-F 0 "#PWR071" H 9700 4050 30  0001 C C
+F 0 "#PWR073" H 9700 4050 30  0001 C C
 F 1 "GND" H 9700 3980 30  0001 C C
 	1    9700 4050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR072
+L GND #PWR074
 U 1 1 4A482CF0
 P 10800 4050
-F 0 "#PWR072" H 10800 4050 30  0001 C C
+F 0 "#PWR074" H 10800 4050 30  0001 C C
 F 1 "GND" H 10800 3980 30  0001 C C
 	1    10800 4050
 	1    0    0    -1  
@@ -1101,28 +1006,28 @@ F 1 "FPCCON24" H 10400 2600 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR073
+L V33 #PWR075
 U 1 1 4A482A69
 P 4050 5250
-F 0 "#PWR073" H 4050 5200 20  0001 C C
+F 0 "#PWR075" H 4050 5200 20  0001 C C
 F 1 "V33" H 4050 5350 30  0000 C C
 	1    4050 5250
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBUS #PWR074
+L VBUS #PWR076
 U 1 1 4A482A5C
 P 3450 5300
-F 0 "#PWR074" H 3450 5250 20  0001 C C
+F 0 "#PWR076" H 3450 5250 20  0001 C C
 F 1 "VBUS" H 3450 5400 30  0000 C C
 	1    3450 5300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR075
+L GND #PWR077
 U 1 1 4A482A50
 P 4050 6800
-F 0 "#PWR075" H 4050 6800 30  0001 C C
+F 0 "#PWR077" H 4050 6800 30  0001 C C
 F 1 "GND" H 4050 6730 30  0001 C C
 	1    4050 6800
 	1    0    0    -1  
@@ -1164,28 +1069,28 @@ F 1 "1K/5%" H 3650 5550 50  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR076
+L GND #PWR078
 U 1 1 4A482926
 P 1050 7050
-F 0 "#PWR076" H 1050 7050 30  0001 C C
+F 0 "#PWR078" H 1050 7050 30  0001 C C
 F 1 "GND" H 1050 6980 30  0001 C C
 	1    1050 7050
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBUS #PWR077
+L VBUS #PWR079
 U 1 1 4A4828AF
 P 2450 5350
-F 0 "#PWR077" H 2450 5300 20  0001 C C
+F 0 "#PWR079" H 2450 5300 20  0001 C C
 F 1 "VBUS" H 2450 5450 30  0000 C C
 	1    2450 5350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR078
+L GND #PWR080
 U 1 1 4A4828A1
 P 2450 5950
-F 0 "#PWR078" H 2450 5950 30  0001 C C
+F 0 "#PWR080" H 2450 5950 30  0001 C C
 F 1 "GND" H 2450 5880 30  0001 C C
 	1    2450 5950
 	1    0    0    -1  
@@ -1209,10 +1114,10 @@ F 1 "PZ1608D221" V 2150 5400 40  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR079
+L GND #PWR081
 U 1 1 4A482821
 P 2450 6650
-F 0 "#PWR079" H 2450 6650 30  0001 C C
+F 0 "#PWR081" H 2450 6650 30  0001 C C
 F 1 "GND" H 2450 6580 30  0001 C C
 	1    2450 6650
 	1    0    0    -1  
@@ -1258,19 +1163,19 @@ F 1 "USB_MINIB" H 1250 6350 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR080
+L V33 #PWR082
 U 1 1 4A482636
 P 4850 2850
-F 0 "#PWR080" H 4850 2800 20  0001 C C
+F 0 "#PWR082" H 4850 2800 20  0001 C C
 F 1 "V33" H 4850 2950 30  0000 C C
 	1    4850 2850
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR081
+L GND #PWR083
 U 1 1 4A4825EB
 P 4150 3500
-F 0 "#PWR081" H 4150 3500 30  0001 C C
+F 0 "#PWR083" H 4150 3500 30  0001 C C
 F 1 "GND" H 4150 3430 30  0001 C C
 	1    4150 3500
 	1    0    0    -1  
@@ -1285,10 +1190,10 @@ F 1 "0.1uF/16V" H 4200 3150 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR082
+L GND #PWR084
 U 1 1 4A4825D2
 P 4850 3400
-F 0 "#PWR082" H 4850 3400 30  0001 C C
+F 0 "#PWR084" H 4850 3400 30  0001 C C
 F 1 "GND" H 4850 3330 30  0001 C C
 	1    4850 3400
 	1    0    0    -1  
@@ -1303,10 +1208,10 @@ F 1 "0.1uF/16V" H 4900 3050 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR083
+L GND #PWR085
 U 1 1 4A48258F
 P 5650 2600
-F 0 "#PWR083" H 5650 2600 30  0001 C C
+F 0 "#PWR085" H 5650 2600 30  0001 C C
 F 1 "GND" H 5650 2530 30  0001 C C
 	1    5650 2600
 	0    -1   -1   0   
@@ -1325,10 +1230,10 @@ DN
 Text Label 4350 2350 2    30   ~
 DP
 $Comp
-L VBAT #PWR084
+L VBAT #PWR086
 U 1 1 4A4824EE
 P 5200 1950
-F 0 "#PWR084" H 5200 1900 20  0001 C C
+F 0 "#PWR086" H 5200 1900 20  0001 C C
 F 1 "VBAT" H 5200 2050 30  0000 C C
 	1    5200 1950
 	1    0    0    -1  
@@ -1407,19 +1312,19 @@ LCDD1
 Text Label 4500 850  2    30   ~
 LCDD0
 $Comp
-L GND #PWR085
+L GND #PWR087
 U 1 1 4A482291
 P 1150 1850
-F 0 "#PWR085" H 1150 1850 30  0001 C C
+F 0 "#PWR087" H 1150 1850 30  0001 C C
 F 1 "GND" H 1150 1780 30  0001 C C
 	1    1150 1850
 	1    0    0    -1  
 $EndComp
 $Comp
-L VDDHP #PWR086
+L VDDHP #PWR088
 U 1 1 4A482259
 P 1150 1300
-F 0 "#PWR086" H 1150 1250 20  0001 C C
+F 0 "#PWR088" H 1150 1250 20  0001 C C
 F 1 "VDDHP" H 1150 1400 30  0000 C C
 	1    1150 1300
 	1    0    0    -1  
@@ -1434,19 +1339,19 @@ F 1 "0.1uF/16V" V 1000 1600 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR087
+L GND #PWR089
 U 1 1 4A4821E0
 P 2000 1550
-F 0 "#PWR087" H 2000 1550 30  0001 C C
+F 0 "#PWR089" H 2000 1550 30  0001 C C
 F 1 "GND" H 2000 1480 30  0001 C C
 	1    2000 1550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR088
+L GND #PWR090
 U 1 1 4A4821C5
 P 2000 1800
-F 0 "#PWR088" H 2000 1800 30  0001 C C
+F 0 "#PWR090" H 2000 1800 30  0001 C C
 F 1 "GND" H 2000 1730 30  0001 C C
 	1    2000 1800
 	1    0    0    -1  
@@ -1454,10 +1359,10 @@ $EndComp
 Text Label 1500 2500 0    30   ~
 VREF
 $Comp
-L GND #PWR089
+L GND #PWR091
 U 1 1 4A482190
 P 1050 3100
-F 0 "#PWR089" H 1050 3100 30  0001 C C
+F 0 "#PWR091" H 1050 3100 30  0001 C C
 F 1 "GND" H 1050 3030 30  0001 C C
 	1    1050 3100
 	1    0    0    -1  
@@ -1481,10 +1386,10 @@ F 1 "10uF/10V" V 750 2750 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR090
+L GND #PWR092
 U 1 1 4A48210D
 P 2000 2750
-F 0 "#PWR090" H 2000 2750 30  0001 C C
+F 0 "#PWR092" H 2000 2750 30  0001 C C
 F 1 "GND" H 2000 2680 30  0001 C C
 	1    2000 2750
 	1    0    0    -1  
@@ -1547,169 +1452,4 @@ F 1 "JZ4720_186P" H 3100 3150 60  0000 C C
 	3    3050 1900
 	1    0    0    -1  
 $EndComp
-Text Label 3100 4450 1    30   ~
-VSYNC
-Text Label 2950 4450 1    30   ~
-LCDDCLK
-Text Label 2800 4450 1    30   ~
-LCD7
-Text Label 2650 4450 1    30   ~
-LCD6
-Text Label 2500 4450 1    30   ~
-LCD5
-Text Label 2350 4450 1    30   ~
-LCD4
-Text Label 3700 4450 1    30   ~
-LCDSDA
-Text Label 3550 4450 1    30   ~
-LCDSCL
-Text Label 3400 4450 1    30   ~
-LCDCS
-Text Label 3250 4450 1    30   ~
-HSYNC
-Text Label 2200 4450 1    30   ~
-LCD3
-Text Label 2050 4450 1    30   ~
-LCD2
-Text Label 1900 4450 1    30   ~
-LCD1
-Text Label 1750 4450 1    30   ~
-LCD0
-Text Label 1600 4450 1    30   ~
-USBDET
-$Comp
-L TESTPOINT TP48
-U 1 1 4A47FBF4
-P 3100 3950
-F 0 "TP48" V 3100 4150 30  0000 C C
-F 1 "TESTPOINT" H 3100 3950 60  0001 C C
-	1    3100 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP47
-U 1 1 4A47FBF3
-P 2950 3950
-F 0 "TP47" V 2950 4150 30  0000 C C
-F 1 "TESTPOINT" H 2950 3950 60  0001 C C
-	1    2950 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP46
-U 1 1 4A47FBF2
-P 2800 3950
-F 0 "TP46" V 2800 4150 30  0000 C C
-F 1 "TESTPOINT" H 2800 3950 60  0001 C C
-	1    2800 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP45
-U 1 1 4A47FBF1
-P 2650 3950
-F 0 "TP45" V 2650 4150 30  0000 C C
-F 1 "TESTPOINT" H 2650 3950 60  0001 C C
-	1    2650 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP44
-U 1 1 4A47FBF0
-P 2500 3950
-F 0 "TP44" V 2500 4150 30  0000 C C
-F 1 "TESTPOINT" H 2500 3950 60  0001 C C
-	1    2500 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP43
-U 1 1 4A47FBEF
-P 2350 3950
-F 0 "TP43" V 2350 4150 30  0000 C C
-F 1 "TESTPOINT" H 2350 3950 60  0001 C C
-	1    2350 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP52
-U 1 1 4A47FBE6
-P 3700 3950
-F 0 "TP52" V 3700 4150 30  0000 C C
-F 1 "TESTPOINT" H 3700 3950 60  0001 C C
-	1    3700 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP51
-U 1 1 4A47FBE5
-P 3550 3950
-F 0 "TP51" V 3550 4150 30  0000 C C
-F 1 "TESTPOINT" H 3550 3950 60  0001 C C
-	1    3550 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP50
-U 1 1 4A47FBE3
-P 3400 3950
-F 0 "TP50" V 3400 4150 30  0000 C C
-F 1 "TESTPOINT" H 3400 3950 60  0001 C C
-	1    3400 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP49
-U 1 1 4A47FBE2
-P 3250 3950
-F 0 "TP49" V 3250 4150 30  0000 C C
-F 1 "TESTPOINT" H 3250 3950 60  0001 C C
-	1    3250 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP42
-U 1 1 4A47FBC7
-P 2200 3950
-F 0 "TP42" V 2200 4150 30  0000 C C
-F 1 "TESTPOINT" H 2200 3950 60  0001 C C
-	1    2200 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP41
-U 1 1 4A47FBB9
-P 2050 3950
-F 0 "TP41" V 2050 4150 30  0000 C C
-F 1 "TESTPOINT" H 2050 3950 60  0001 C C
-	1    2050 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP40
-U 1 1 4A47FBB8
-P 1900 3950
-F 0 "TP40" V 1900 4150 30  0000 C C
-F 1 "TESTPOINT" H 1900 3950 60  0001 C C
-	1    1900 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP39
-U 1 1 4A47FBB1
-P 1750 3950
-F 0 "TP39" V 1750 4150 30  0000 C C
-F 1 "TESTPOINT" H 1750 3950 60  0001 C C
-	1    1750 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP79
-U 1 1 4A47FB6C
-P 1600 3950
-F 0 "TP79" V 1600 4150 30  0000 C C
-F 1 "TESTPOINT" H 1600 3950 60  0001 C C
-	1    1600 3950
-	1    0    0    -1  
-$EndComp
 $EndSCHEMATC
diff --git a/main/memory.sch b/main/memory.sch
old mode 100755
new mode 100644
index a1f5e10..b0ff18c
--- a/main/memory.sch
+++ b/main/memory.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,./Qi_AVT2.cache
+LIBS:power,../components/boot_switch,../components/hd,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
@@ -17,19 +17,6 @@ Text Label 1300 3000 0    30   ~
 RXD
 Text GLabel 1300 2950 0    30   Output
 TXD
-Wire Wire Line
-	10000 2050 10000 2500
-Text Label 10000 2500 1    30   ~
-TXD
-$Comp
-L TESTPOINT TP75
-U 1 1 4A7F8308
-P 10000 2000
-F 0 "TP75" V 10000 2200 30  0000 C C
-F 1 "TESTPOINT" H 10000 2000 60  0001 C C
-	1    10000 2000
-	1    0    0    -1  
-$EndComp
 Text Label 4150 2950 2    30   ~
 GPB28
 Wire Wire Line
@@ -166,40 +153,6 @@ Wire Wire Line
 Connection ~ 6050 3650
 Wire Wire Line
 	6050 3650 6050 3750
-Wire Wire Line
-	9850 2050 9850 2500
-Wire Wire Line
-	9700 2050 9700 2500
-Wire Wire Line
-	9550 2050 9550 2500
-Wire Wire Line
-	9400 2050 9400 2500
-Wire Wire Line
-	9250 2050 9250 2500
-Wire Wire Line
-	9100 2050 9100 2500
-Wire Wire Line
-	10600 1150 10600 1600
-Wire Wire Line
-	10450 1150 10450 1600
-Wire Wire Line
-	10300 1150 10300 1600
-Wire Wire Line
-	10150 1150 10150 1600
-Wire Wire Line
-	10000 1150 10000 1600
-Wire Wire Line
-	9850 1150 9850 1600
-Wire Wire Line
-	9700 1150 9700 1600
-Wire Wire Line
-	9550 1150 9550 1600
-Wire Wire Line
-	9400 1150 9400 1600
-Wire Wire Line
-	9250 1150 9250 1600
-Wire Wire Line
-	9100 1150 9100 1600
 Connection ~ 7600 1100
 Wire Wire Line
 	7600 1150 7600 1100
@@ -551,19 +504,6 @@ Wire Wire Line
 	8750 6150 8750 6000
 Wire Wire Line
 	3650 2900 4150 2900
-Wire Wire Line
-	10150 2050 10150 2500
-Text Label 10150 2500 1    30   ~
-GPB28
-$Comp
-L TESTPOINT TP80
-U 1 1 4A7F6EE5
-P 10150 2000
-F 0 "TP80" V 10150 2200 30  0000 C C
-F 1 "TESTPOINT" H 10150 2000 60  0001 C C
-	1    10150 2000
-	1    0    0    -1  
-$EndComp
 Text GLabel 4150 2900 2    30   Input
 USB_ID
 Text GLabel 4150 2300 2    30   Output
@@ -573,19 +513,19 @@ Text Notes 6750 6350 0    50   ~
 NoConn ~ 6650 5700
 NoConn ~ 6650 5650
 $Comp
-L V33 #PWR091
+L V33 #PWR093
 U 1 1 4A481C7B
 P 8750 5500
-F 0 "#PWR091" H 8750 5450 20  0001 C C
+F 0 "#PWR093" H 8750 5450 20  0001 C C
 F 1 "V33" H 8750 5600 30  0000 C C
 	1    8750 5500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR092
+L GND #PWR094
 U 1 1 4A481C6B
 P 8750 6150
-F 0 "#PWR092" H 8750 6150 30  0001 C C
+F 0 "#PWR094" H 8750 6150 30  0001 C C
 F 1 "GND" H 8750 6080 30  0001 C C
 	1    8750 6150
 	1    0    0    -1  
@@ -608,10 +548,10 @@ Text Label 7950 5800 2    30   ~
 D3
 NoConn ~ 7450 5150
 $Comp
-L V33 #PWR093
+L V33 #PWR095
 U 1 1 4A481B33
 P 5450 5500
-F 0 "#PWR093" H 5450 5450 20  0001 C C
+F 0 "#PWR095" H 5450 5450 20  0001 C C
 F 1 "V33" H 5450 5600 30  0000 C C
 	1    5450 5500
 	1    0    0    -1  
@@ -625,10 +565,10 @@ FALE/GPB16
 Text Label 6100 5750 0    30   ~
 FCLE/GPB15
 $Comp
-L GND #PWR094
+L GND #PWR096
 U 1 1 4A481A8B
 P 6500 5650
-F 0 "#PWR094" H 6500 5650 30  0001 C C
+F 0 "#PWR096" H 6500 5650 30  0001 C C
 F 1 "GND" H 6500 5580 30  0001 C C
 	1    6500 5650
 	1    0    0    -1  
@@ -644,10 +584,10 @@ FRB_N
 Text Label 6150 5250 0    30   ~
 FRB_N
 $Comp
-L V33 #PWR095
+L V33 #PWR097
 U 1 1 4A481948
 P 5950 4550
-F 0 "#PWR095" H 5950 4500 20  0001 C C
+F 0 "#PWR097" H 5950 4500 20  0001 C C
 F 1 "V33" H 5950 4650 30  0000 C C
 	1    5950 4550
 	1    0    0    -1  
@@ -744,28 +684,28 @@ SDD1
 Text GLabel 1300 6200 0    30   Input
 SDDET
 $Comp
-L V33 #PWR096
+L V33 #PWR098
 U 1 1 4A480302
 P 1800 5550
-F 0 "#PWR096" H 1800 5500 20  0001 C C
+F 0 "#PWR098" H 1800 5500 20  0001 C C
 F 1 "V33" H 1800 5650 30  0000 C C
 	1    1800 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33SD #PWR097
+L V33SD #PWR099
 U 1 1 4A480210
 P 3400 5450
-F 0 "#PWR097" H 3400 5400 20  0001 C C
+F 0 "#PWR099" H 3400 5400 20  0001 C C
 F 1 "V33SD" H 3400 5550 30  0000 C C
 	1    3400 5450
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR098
+L GND #PWR0100
 U 1 1 4A4801C9
 P 3550 6800
-F 0 "#PWR098" H 3550 6800 30  0001 C C
+F 0 "#PWR0100" H 3550 6800 30  0001 C C
 F 1 "GND" H 3550 6730 30  0001 C C
 	1    3550 6800
 	1    0    0    -1  
@@ -834,10 +774,10 @@ F 1 "MS_1D77" H 4100 6050 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33SD #PWR099
+L V33SD #PWR0101
 U 1 1 4A480089
 P 3700 4100
-F 0 "#PWR099" H 3700 4050 20  0001 C C
+F 0 "#PWR0101" H 3700 4050 20  0001 C C
 F 1 "V33SD" H 3700 4200 30  0000 C C
 	1    3700 4100
 	1    0    0    -1  
@@ -845,19 +785,19 @@ $EndComp
 Text GLabel 2150 4650 0    30   Input
 SDPWEN
 $Comp
-L V33 #PWR0100
+L V33 #PWR0102
 U 1 1 4A47FFDD
 P 2150 4100
-F 0 "#PWR0100" H 2150 4050 20  0001 C C
+F 0 "#PWR0102" H 2150 4050 20  0001 C C
 F 1 "V33" H 2150 4200 30  0000 C C
 	1    2150 4100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0101
+L GND #PWR0103
 U 1 1 4A47FFBE
 P 3700 4850
-F 0 "#PWR0101" H 3700 4850 30  0001 C C
+F 0 "#PWR0103" H 3700 4850 30  0001 C C
 F 1 "GND" H 3700 4780 30  0001 C C
 	1    3700 4850
 	1    0    0    -1  
@@ -890,19 +830,19 @@ F 1 "10uF/10V" V 3400 4500 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0102
+L GND #PWR0104
 U 1 1 4A47FEBC
 P 5650 4300
-F 0 "#PWR0102" H 5650 4300 30  0001 C C
+F 0 "#PWR0104" H 5650 4300 30  0001 C C
 F 1 "GND" H 5650 4230 30  0001 C C
 	1    5650 4300
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR0103
+L V33 #PWR0105
 U 1 1 4A47FEB1
 P 5650 3600
-F 0 "#PWR0103" H 5650 3550 20  0001 C C
+F 0 "#PWR0105" H 5650 3550 20  0001 C C
 F 1 "V33" H 5650 3700 30  0000 C C
 	1    5650 3600
 	1    0    0    -1  
@@ -979,207 +919,20 @@ F 1 "10uF/10V" V 5800 3950 50  0000 L C
 	1    5650 3950
 	1    0    0    -1  
 $EndComp
-Text Label 9850 2500 1    30   ~
-CKE
-Text Label 9700 2500 1    30   ~
-DCS0_N
-Text Label 9550 2500 1    30   ~
-FRB_N
-Text Label 9400 2500 1    30   ~
-CKO
-Text Label 9250 2500 1    30   ~
-RDWR_N
-Text Label 9100 2500 1    30   ~
-FWE_N
-Text Label 10600 1600 1    30   ~
-FRE_N
-Text Label 10450 1600 1    30   ~
-CS2_N
-Text Label 10300 1600 1    30   ~
-CS1_N
-Text Label 10150 1600 1    30   ~
-SDDET
-Text Label 10000 1600 1    30   ~
-SDCMD
-Text Label 9850 1600 1    30   ~
-SDCLK
-Text Label 9700 1600 1    30   ~
-SDD3
-Text Label 9550 1600 1    30   ~
-SDD2
-Text Label 9400 1600 1    30   ~
-SDD1
-Text Label 9250 1600 1    30   ~
-SDD0
-Text Label 9100 1600 1    30   ~
-SDPWEN
 $Comp
-L TESTPOINT TP31
-U 1 1 4A47FBF4
-P 9850 2000
-F 0 "TP31" V 9850 2200 30  0000 C C
-F 1 "TESTPOINT" H 9850 2000 60  0001 C C
-	1    9850 2000
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP30
-U 1 1 4A47FBF3
-P 9700 2000
-F 0 "TP30" V 9700 2200 30  0000 C C
-F 1 "TESTPOINT" H 9700 2000 60  0001 C C
-	1    9700 2000
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP29
-U 1 1 4A47FBF2
-P 9550 2000
-F 0 "TP29" V 9550 2200 30  0000 C C
-F 1 "TESTPOINT" H 9550 2000 60  0001 C C
-	1    9550 2000
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP28
-U 1 1 4A47FBF1
-P 9400 2000
-F 0 "TP28" V 9400 2200 30  0000 C C
-F 1 "TESTPOINT" H 9400 2000 60  0001 C C
-	1    9400 2000
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP27
-U 1 1 4A47FBF0
-P 9250 2000
-F 0 "TP27" V 9250 2200 30  0000 C C
-F 1 "TESTPOINT" H 9250 2000 60  0001 C C
-	1    9250 2000
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP26
-U 1 1 4A47FBEF
-P 9100 2000
-F 0 "TP26" V 9100 2200 30  0000 C C
-F 1 "TESTPOINT" H 9100 2000 60  0001 C C
-	1    9100 2000
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP21
-U 1 1 4A47FBE7
-P 10600 1100
-F 0 "TP21" V 10600 1300 30  0000 C C
-F 1 "TESTPOINT" H 10600 1100 60  0001 C C
-	1    10600 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP20
-U 1 1 4A47FBE6
-P 10450 1100
-F 0 "TP20" V 10450 1300 30  0000 C C
-F 1 "TESTPOINT" H 10450 1100 60  0001 C C
-	1    10450 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP19
-U 1 1 4A47FBE5
-P 10300 1100
-F 0 "TP19" V 10300 1300 30  0000 C C
-F 1 "TESTPOINT" H 10300 1100 60  0001 C C
-	1    10300 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP18
-U 1 1 4A47FBE3
-P 10150 1100
-F 0 "TP18" V 10150 1300 30  0000 C C
-F 1 "TESTPOINT" H 10150 1100 60  0001 C C
-	1    10150 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP17
-U 1 1 4A47FBE2
-P 10000 1100
-F 0 "TP17" V 10000 1300 30  0000 C C
-F 1 "TESTPOINT" H 10000 1100 60  0001 C C
-	1    10000 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP16
-U 1 1 4A47FBC8
-P 9850 1100
-F 0 "TP16" V 9850 1300 30  0000 C C
-F 1 "TESTPOINT" H 9850 1100 60  0001 C C
-	1    9850 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP15
-U 1 1 4A47FBC7
-P 9700 1100
-F 0 "TP15" V 9700 1300 30  0000 C C
-F 1 "TESTPOINT" H 9700 1100 60  0001 C C
-	1    9700 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP14
-U 1 1 4A47FBB9
-P 9550 1100
-F 0 "TP14" V 9550 1300 30  0000 C C
-F 1 "TESTPOINT" H 9550 1100 60  0001 C C
-	1    9550 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP13
-U 1 1 4A47FBB8
-P 9400 1100
-F 0 "TP13" V 9400 1300 30  0000 C C
-F 1 "TESTPOINT" H 9400 1100 60  0001 C C
-	1    9400 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP12
-U 1 1 4A47FBB1
-P 9250 1100
-F 0 "TP12" V 9250 1300 30  0000 C C
-F 1 "TESTPOINT" H 9250 1100 60  0001 C C
-	1    9250 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP11
-U 1 1 4A47FB6C
-P 9100 1100
-F 0 "TP11" V 9100 1300 30  0000 C C
-F 1 "TESTPOINT" H 9100 1100 60  0001 C C
-	1    9100 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L V33 #PWR0104
+L V33 #PWR0106
 U 1 1 4A47F986
 P 7500 1050
-F 0 "#PWR0104" H 7500 1000 20  0001 C C
+F 0 "#PWR0106" H 7500 1000 20  0001 C C
 F 1 "V33" H 7500 1150 30  0000 C C
 	1    7500 1050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0105
+L GND #PWR0107
 U 1 1 4A47F94A
 P 7500 3050
-F 0 "#PWR0105" H 7500 3050 30  0001 C C
+F 0 "#PWR0107" H 7500 3050 30  0001 C C
 F 1 "GND" H 7500 2980 30  0001 C C
 	1    7500 3050
 	1    0    0    -1  
@@ -1303,10 +1056,10 @@ A11
 Text Label 4800 2100 2    30   ~
 BUZPWM
 $Comp
-L GND #PWR0106
+L GND #PWR0108
 U 1 1 4A47F42B
 P 4750 2300
-F 0 "#PWR0106" H 4750 2300 30  0001 C C
+F 0 "#PWR0108" H 4750 2300 30  0001 C C
 F 1 "GND" H 4750 2230 30  0001 C C
 	1    4750 2300
 	1    0    0    -1  
diff --git a/main/power_tree.sch b/main/power_tree.sch
old mode 100755
new mode 100644
index 3827a8e..51f9de4
--- a/main/power_tree.sch
+++ b/main/power_tree.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:power,./Qi_AVT2.cache
+LIBS:power,../components/boot_switch,../components/hd,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/models/JZ4720.mod b/models/JZ4720.mod
index 053552f..4f615f8 100755
--- a/models/JZ4720.mod
+++ b/models/JZ4720.mod
@@ -181,145 +181,145 @@ $EndPAD
 
 
 $PAD
-Sh "34" R 51 275 0 0 3150
+Sh "57" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1126	2575
 $EndPAD
 $PAD
-Sh "35" R 51 275 0 0 3150
+Sh "56" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1191	2510
 $EndPAD
 $PAD
-Sh "36" R 51 275 0 0 3150
+Sh "55" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1256	2445
 $EndPAD
 $PAD
-Sh "37" R 51 275 0 0 3150
+Sh "54" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1321	2380
 $EndPAD
 $PAD
-Sh "38" R 51 275 0 0 3150
+Sh "53" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1386	2314
 $EndPAD
 $PAD
-Sh "39" R 51 275 0 0 3150
+Sh "52" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1451	2249
 $EndPAD
 $PAD
-Sh "40" R 51 275 0 0 3150
+Sh "51" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1516	2184
 $EndPAD
 $PAD
-Sh "41" R 51 275 0 0 3150
+Sh "50" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1581	2119
 $EndPAD
 $PAD
-Sh "42" R 51 275 0 0 3150
+Sh "49" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1646	2054
 $EndPAD
 $PAD
-Sh "43" R 51 275 0 0 3150
+Sh "48" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1711	1989
 $EndPAD
 $PAD
-Sh "44" R 51 275 0 0 3150
+Sh "47" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1776	1924
 $EndPAD
 $PAD
-Sh "45" R 51 275 0 0 3150
+Sh "46" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1841	1859
 $EndPAD
 $PAD
-Sh "46" R 51 275 0 0 3150
+Sh "45" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1906	1794
 $EndPAD
 $PAD
-Sh "47" R 51 275 0 0 3150
+Sh "44" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -1971	1729
 $EndPAD
 $PAD
-Sh "48" R 51 275 0 0 3150
+Sh "43" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -2037	1664
 $EndPAD
 $PAD
-Sh "49" R 51 275 0 0 3150
+Sh "42" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -2102	1599
 $EndPAD
 $PAD
-Sh "50" R 51 275 0 0 3150
+Sh "41" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -2167	1534
 $EndPAD
 $PAD
-Sh "51" R 51 275 0 0 3150
+Sh "40" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -2232	1468
 $EndPAD
 $PAD
-Sh "52" R 51 275 0 0 3150
+Sh "39" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -2297	1403
 $EndPAD
 $PAD
-Sh "53" R 51 275 0 0 3150
+Sh "38" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -2362	1338
 $EndPAD
 $PAD
-Sh "54" R 51 275 0 0 3150
+Sh "37" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -2427	1273
 $EndPAD
 $PAD
-Sh "55" R 51 275 0 0 3150
+Sh "36" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -2492	1208
 $EndPAD
 $PAD
-Sh "56" R 51 275 0 0 3150
+Sh "35" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -2557	1143
 $EndPAD
 $PAD
-Sh "57" R 51 275 0 0 3150
+Sh "34" R 51 275 0 0 3150
 Dr 0 0 0
 At SMD N 00888000
 Po -2622	1078
@@ -788,7 +788,7 @@ At SMD N 00888000
 Po 800 2677
 $EndPAD
 $PAD
-Sh "78" R 51 275 0 0 1800
+Sh "79" R 51 275 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Po 884 2677