From f8d1531cfbc9e844b4311ad097782115a28a8a39 Mon Sep 17 00:00:00 2001
From: Juan Brinez <jgbrinezm@unal.edu.co>
Date: Mon, 30 Nov 2009 09:55:39 -0500
Subject: [PATCH] Changes: see the <layout_note_revised2.txt> file.

---
 components/boot_switch.bak |   20 +
 components/boot_switch.bck |    3 +
 components/boot_switch.dcm |    2 +-
 components/boot_switch.lib |    8 +-
 components/power.dcm       |    3 +
 components/power.lib       |  581 ++++++++++++++
 components/switch.bak      |    8 +-
 components/switch.bck      |    2 +-
 components/switch.dcm      |    2 +-
 components/switch.lib      |    8 +-
 main/Qi_AVT2.bak           | 1463 ++++++++++++++++++------------------
 main/Qi_AVT2.cache.bck     |    2 +-
 main/Qi_AVT2.cache.lib     |   22 +-
 main/Qi_AVT2.erc           |    5 +-
 main/Qi_AVT2.sch           | 1460 +++++++++++++++++------------------
 main/audio.bak             |    2 +-
 main/audio.sch             |    2 +-
 main/function_block.bak    |    2 +-
 main/function_block.sch    |    2 +-
 main/key_matrix.bak        |    2 +-
 main/key_matrix.sch        |    2 +-
 main/lcd_usb.bak           |    2 +-
 main/lcd_usb.sch           |    2 +-
 main/memory.bak            |    2 +-
 main/memory.sch            |    2 +-
 main/power_tree.bak        |    2 +-
 main/power_tree.sch        |    2 +-
 27 files changed, 2111 insertions(+), 1502 deletions(-)
 create mode 100644 components/boot_switch.bak
 create mode 100644 components/boot_switch.bck
 create mode 100644 components/power.dcm
 create mode 100644 components/power.lib

diff --git a/components/boot_switch.bak b/components/boot_switch.bak
new file mode 100644
index 0000000..a44725f
--- /dev/null
+++ b/components/boot_switch.bak
@@ -0,0 +1,20 @@
+EESchema-LIBRARY Version 2.3  Date: 30/11/2009-14:43:49
+#
+# 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 B
+X 2 2 -450 0 300 R 50 50 1 1 B
+X 3 3 -450 100 300 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/components/boot_switch.bck b/components/boot_switch.bck
new file mode 100644
index 0000000..e5bfc24
--- /dev/null
+++ b/components/boot_switch.bck
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0  Date: 30/11/2009-14:43:49
+#
+#End Doc Library
diff --git a/components/boot_switch.dcm b/components/boot_switch.dcm
index d9e5f2f..f3c858e 100644
--- a/components/boot_switch.dcm
+++ b/components/boot_switch.dcm
@@ -1,3 +1,3 @@
-EESchema-DOCLIB  Version 2.0  Date: 12/9/2009-16:01:04
+EESchema-DOCLIB  Version 2.0  Date: 30/11/2009-14:45:00
 #
 #End Doc Library
diff --git a/components/boot_switch.lib b/components/boot_switch.lib
index 97f33cc..e61e0cc 100644
--- a/components/boot_switch.lib
+++ b/components/boot_switch.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 12/9/2009-16:01:04
+EESchema-LIBRARY Version 2.3  Date: 30/11/2009-14:45:00
 #
 # SWITCH
 #
@@ -11,9 +11,9 @@ $FPLIST
 $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
+X 1 1 -450 -100 300 R 50 50 1 1 O
+X 2 2 -450 0 300 R 50 50 1 1 B
+X 3 3 -450 100 300 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
diff --git a/components/power.dcm b/components/power.dcm
new file mode 100644
index 0000000..eeb3578
--- /dev/null
+++ b/components/power.dcm
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0  Date: 13/6/2008-13:45:04
+#
+#End Doc Library
diff --git a/components/power.lib b/components/power.lib
new file mode 100644
index 0000000..75e02e9
--- /dev/null
+++ b/components/power.lib
@@ -0,0 +1,581 @@
+EESchema-LIBRARY Version 2.3  Date: 13/6/2008-13:45:04
+#
+# +1.2V
+#
+DEF +1.2V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 140 20 H I C C
+F1 "+1.2V" 0 110 30 H V C C
+DRAW
+P 3 0 0 0  0 0  0 40  0 40 N
+C 0 60 20 0 1 0 N
+X +1.2V 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +1.8V
+#
+DEF +1.8V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 140 20 H I C C
+F1 "+1.8V" 0 110 30 H V C C
+ALIAS 1V8
+DRAW
+P 3 0 0 0  0 0  0 40  0 40 N
+C 0 60 20 0 1 0 N
+X +1.8V 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +12C
+#
+DEF +12C #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -30 30 H I C C
+F1 "+12C" 0 110 40 H V C C
+DRAW
+P 4 0 1 0  0 0  0 40  0 40  0 40 N
+C 0 60 20 0 1 0 N
+X +12C 1 0 0 0 U 30 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +12F
+#
+DEF +12F #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -30 30 H I C C
+F1 "+12F" 0 110 40 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
+X +12F 1 0 0 0 U 30 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +12L
+#
+DEF +12L #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -50 20 H I C C
+F1 "+12L" 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
+X +12L 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +12LF
+#
+DEF +12LF #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -50 20 H I C C
+F1 "+12LF" 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
+X +12LF 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +12P
+#
+DEF +12P #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -30 30 H I C C
+F1 "+12P" 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
+X +12P 1 0 0 0 U 30 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +12V
+#
+DEF +12V #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -50 20 H I C C
+F1 "+12V" 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
+X +12V 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +2.5V
+#
+DEF +2.5V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -50 20 H I C C
+F1 "+2.5V" 0 100 30 H V C C
+ALIAS +2,5V
+DRAW
+P 3 0 1 0  0 0  0 40  0 40 N
+C 0 60 20 0 1 0 N
+X +2.5V 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +24V
+#
+DEF +24V #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -50 20 H I C C
+F1 "+24V" 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
+X +24V 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +3.3V
+#
+DEF +3.3V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -40 30 H I C C
+F1 "+3.3V" 0 110 30 H V C C
+ALIAS +3,3V
+DRAW
+P 3 0 1 0  0 0  0 40  0 40 N
+C 0 60 20 0 1 0 N
+X +3.3V 1 0 0 0 U 30 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +3.3VADC
+#
+DEF +3.3VADC #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 120 20 H I C C
+F1 "+3.3VADC" 0 90 30 H V C C
+DRAW
+P 3 0 1 0  0 0  0 40  0 40 N
+P 6 0 1 0  0 40  20 20  0 70  -20 20  0 40  0 40 N
+X +3.3VADC 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +3.3VDAC
+#
+DEF +3.3VDAC #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 120 20 H I C C
+F1 "+3.3VDAC" 0 90 30 H V C C
+DRAW
+P 3 0 1 0  0 0  0 40  0 40 N
+P 6 0 1 0  0 40  20 20  0 70  -20 20  0 40  0 40 N
+X +3.3VDAC 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +3.3VP
+#
+DEF +3.3VP #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 50 30 20 H I C C
+F1 "+3.3VP" 0 90 30 H V C C
+DRAW
+P 7 0 1 0  20 30  0 40  -20 30  -10 70  10 70  20 30  20 30 N
+P 3 0 1 0  0 0  0 40  0 40 N
+X +3.3VP 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +5C
+#
+DEF +5C #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -50 20 H I C C
+F1 "+5C" 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
+X +5C 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +5F
+#
+DEF +5F #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -50 20 H I C C
+F1 "+5F" 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
+X +5F 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +5P
+#
+DEF +5P #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 130 20 H I C C
+F1 "+5P" 0 100 30 H V C C
+DRAW
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+P 3 0 1 0  0 0  0 50  0 50 N
+X +5P 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +5V
+#
+DEF +5V #PWR 0 40 Y Y 1 F P
+F0 "#PWR" 0 90 20 H I C C
+F1 "+5V" 0 90 30 H V C C
+DRAW
+P 4 0 1 0  0 0  0 30  0 30  0 30 N
+C 0 50 20 0 1 0 N
+X +5V 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +5VA
+#
+DEF +5VA #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 130 20 H I C C
+F1 "+5VA" 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
+X +5VA 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +5VD
+#
+DEF +5VD #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -50 20 H I C C
+F1 "+5VD" 0 100 30 H V C C
+DRAW
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+P 3 0 1 0  0 0  0 50  0 50 N
+X +5VD 1 0 0 0 U 20 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +5VL
+#
+DEF +5VL #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 130 20 H I C C
+F1 "+5VL" 0 100 30 H V C C
+DRAW
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+P 3 0 1 0  0 0  0 50  0 50 N
+X +5VL 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +5VP
+#
+DEF +5VP #PWR 0 40 Y Y 1 F P
+F0 "#PWR" 0 90 20 H I C C
+F1 "+5VP" 0 90 30 H V C C
+DRAW
+P 4 0 1 0  0 0  0 30  0 30  0 30 N
+C 0 50 20 0 1 0 N
+X +5VP 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +6V
+#
+DEF +6V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 130 20 H I C C
+F1 "+6V" 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
+X +6V 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +8V
+#
+DEF +8V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -30 20 H I C C
+F1 "+8V" 0 110 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
+X +8V 1 0 0 0 U 10 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +BATT
+#
+DEF +BATT #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -50 20 H I C C
+F1 "+BATT" 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
+X +BATT 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -10V
+#
+DEF -10V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 130 20 H I C C
+F1 "-10V" 0 100 30 H V C C
+DRAW
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+P 3 0 1 0  0 0  0 50  0 50 N
+X -10V 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -12V
+#
+DEF -12V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 130 20 H I C C
+F1 "-12V" 0 100 30 H V C C
+DRAW
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+P 3 0 1 0  0 0  0 50  0 50 N
+X -12V 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -5F
+#
+DEF -5F PWR 0 0 Y Y 1 F N
+F0 "PWR" 0 140 20 H I C C
+F1 "-5F" 0 110 30 H V C C
+DRAW
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+P 3 0 1 0  0 0  0 50  0 50 N
+X -5F 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -5V
+#
+DEF -5V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 140 20 H I C C
+F1 "-5V" 0 110 30 H V C C
+DRAW
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+P 3 0 1 0  0 0  0 50  0 50 N
+X -5V 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -5VA
+#
+DEF -5VA #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 200 40 H I C C
+F1 "-5VA" 0 150 40 H V C C
+DRAW
+P 2 0 1 0  0 60  0 0 N
+C 0 80 20 0 1 0 N
+X -5VA 1 0 0 0 U 40 40 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -6V
+#
+DEF -6V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 120 20 H I C C
+F1 "-6V" 0 100 20 H V C C
+DRAW
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+P 3 0 1 0  0 0  0 50  0 50 N
+X -6V 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -8V
+#
+DEF -8V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 130 20 H I C C
+F1 "-8V" 0 100 30 H V C C
+DRAW
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+P 3 0 1 0  0 0  0 50  0 50 N
+X -8V 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -VAA
+#
+DEF -VAA #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 20 H I C C
+F1 "-VAA" 0 100 30 H V C C
+DRAW
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+P 3 0 1 0  0 0  0 50  0 50 N
+X -VAA 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# 3V3
+#
+DEF 3V3 #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 40 H I C C
+F1 "3V3" 0 149 40 H V C C
+DRAW
+P 6 0 1 0  0 60  20 40  0 90  -20 40  0 60  0 60 N
+P 2 0 1 0  0 60  0 0 N
+X 3V3 1 0 0 0 U 30 30 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# AGND
+#
+DEF AGND #PWR 0 10 Y Y 1 F P
+F0 "#PWR" 0 0 40 H I C C
+F1 "AGND" 0 -70 50 H V C C
+DRAW
+P 4 0 1 0  -40 0  40 0  0 -40  -40 0 N
+X AGND 1 0 0 0 U 40 40 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# DGND
+#
+DEF DGND #PWR 0 40 Y Y 1 F N
+F0 "#PWR" 0 0 40 H I C C
+F1 "DGND" 0 -70 40 H V C C
+DRAW
+P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+X DGND 1 0 0 0 U 40 40 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF ~GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 30 H I C C
+F1 "GND" 0 -70 30 H I C C
+DRAW
+P 4 0 1 4  -50 0  0 -50  50 0  -50 0 N
+X GND 1 0 0 0 U 30 30 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# GNDA
+#
+DEF GNDA #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 40 H I C C
+F1 "GNDA" 0 -70 40 H V C C
+DRAW
+P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+X GNDA 1 0 0 0 U 40 40 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# GNDPWR
+#
+DEF GNDPWR #PWR 0 0 N N 1 F P
+F0 "#PWR" 0 50 40 H I C C
+F1 "GNDPWR" 0 -80 40 H V C C
+DRAW
+P 3 0 1 10  40 0  -40 0  -40 0 N
+P 4 0 1 8  40 0  30 -30  30 -30  30 -30 N
+P 3 0 1 8  20 0  10 -30  10 -30 N
+P 3 0 1 8  0 0  -10 -30  -10 -30 N
+P 3 0 1 8  -20 0  -30 -30  -30 -30 N
+P 3 0 1 8  -40 0  -50 -30  -50 -30 N
+X GNDPWR 1 0 0 0 U 40 40 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 270 30 H I C C
+F1 "PWR_FLAG" 0 230 30 H V C C
+DRAW
+P 3 0 1 0  0 0  0 100  0 100 N
+P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
+X pwr 1 0 0 0 U 20 20 0 0 w
+ENDDRAW
+ENDDEF
+#
+# VAA
+#
+DEF VAA #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 60 30 H I C C
+F1 "VAA" 0 110 30 H V C C
+DRAW
+P 4 0 1 0  0 40  0 0  0 0  0 0 N
+C 0 60 20 0 1 0 N
+X VAA 1 0 0 0 U 40 40 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# VCC
+#
+DEF VCC #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 100 30 H I C C
+F1 "VCC" 0 100 30 H V C C
+DRAW
+P 3 0 1 4  0 0  0 30  0 30 N
+C 0 50 20 0 1 4 N
+X VCC 1 0 0 0 U 20 20 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# VCOM
+#
+DEF VCOM #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 200 40 H I C C
+F1 "VCOM" 0 150 40 H V C C
+DRAW
+P 2 0 1 0  0 60  0 0 N
+C 0 80 20 0 1 0 N
+X VCOM 1 0 0 0 U 40 40 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# VDD
+#
+DEF VDD #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 100 30 H I C C
+F1 "VDD" 0 110 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
+X VDD 1 0 0 0 U 40 40 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# VEE
+#
+DEF VEE #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 200 40 H I C C
+F1 "VEE" 0 150 40 H V C C
+DRAW
+P 2 0 1 0  0 60  0 0 N
+C 0 80 20 0 1 0 N
+X VEE 1 0 0 0 U 40 40 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# VMEM
+#
+DEF VMEM #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 200 40 H I C C
+F1 "VMEM" 0 150 40 H V C C
+DRAW
+P 2 0 1 0  0 60  0 0 N
+C 0 80 20 0 1 0 N
+X VMEM 1 0 0 0 U 40 40 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# VPP
+#
+DEF VPP #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 200 40 H I C C
+F1 "VPP" 0 150 40 H V C C
+DRAW
+P 2 0 1 0  0 60  0 0 N
+C 0 80 20 0 1 0 N
+X VPP 1 0 0 0 U 40 40 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# VSS
+#
+DEF VSS #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 30 H I C C
+F1 "VSS" 0 -70 30 H V C C
+DRAW
+P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+X VSS 1 0 0 0 U 30 30 1 1 W N
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/components/switch.bak b/components/switch.bak
index c24098a..f408e21 100644
--- a/components/switch.bak
+++ b/components/switch.bak
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 30/11/2009-02:36:06
+EESchema-LIBRARY Version 2.3  Date: 30/11/2009-14:40:15
 #
 # SWITCH
 #
@@ -11,9 +11,9 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S 150 -200 -150 200 0 1 0 N
-X 1 1 -450 -100 300 R 50 50 1 1 I
-X 2 2 -450 0 300 R 50 50 1 1 I
-X 3 3 -450 100 300 R 50 50 1 1 I
+X 1 1 -450 -100 300 R 50 50 1 1 T
+X 2 2 -450 0 300 R 50 50 1 1 B
+X 3 3 -450 100 300 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
diff --git a/components/switch.bck b/components/switch.bck
index 60966e1..7691852 100644
--- a/components/switch.bck
+++ b/components/switch.bck
@@ -1,3 +1,3 @@
-EESchema-DOCLIB  Version 2.0  Date: 30/11/2009-02:36:06
+EESchema-DOCLIB  Version 2.0  Date: 30/11/2009-14:40:15
 #
 #End Doc Library
diff --git a/components/switch.dcm b/components/switch.dcm
index 5e631bd..33f1cf5 100644
--- a/components/switch.dcm
+++ b/components/switch.dcm
@@ -1,3 +1,3 @@
-EESchema-DOCLIB  Version 2.0  Date: 30/11/2009-02:37:37
+EESchema-DOCLIB  Version 2.0  Date: 30/11/2009-14:48:19
 #
 #End Doc Library
diff --git a/components/switch.lib b/components/switch.lib
index 75f564d..492ba48 100644
--- a/components/switch.lib
+++ b/components/switch.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 30/11/2009-02:37:37
+EESchema-LIBRARY Version 2.3  Date: 30/11/2009-14:48:19
 #
 # SWITCH
 #
@@ -11,9 +11,9 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S 150 -200 -150 200 0 1 0 N
-X 1 1 -450 -100 300 R 50 50 1 1 I
-X 2 2 -450 0 300 R 50 50 1 1 I
-X 3 3 -450 100 300 R 50 50 1 1 I
+X 1 1 -450 -100 300 R 50 50 1 1 O
+X 2 2 -450 0 300 R 50 50 1 1 B
+X 3 3 -450 100 300 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
diff --git a/main/Qi_AVT2.bak b/main/Qi_AVT2.bak
index 9cf6c12..19e8587 100644
--- a/main/Qi_AVT2.bak
+++ b/main/Qi_AVT2.bak
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
@@ -14,733 +14,745 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	13450 6300 13450 6400
+	15050 7350 14650 7350
 Wire Wire Line
-	13450 6400 13600 6400
-Connection ~ 8500 2850
+	15050 7150 14500 7150
+Connection ~ 8500 2100
 Wire Wire Line
-	7900 2850 8900 2850
+	8500 2100 8900 2100
 Wire Wire Line
-	8900 2850 8900 2650
-Wire Wire Line
-	14650 7550 14650 7350
-Wire Wire Line
-	14650 7350 14950 7350
-Connection ~ 14500 5900
-Wire Wire Line
-	14500 5900 14500 5500
-Wire Wire Line
-	14500 5500 14450 5500
-Wire Wire Line
-	13300 5500 13300 5750
-Wire Wire Line
-	1900 2750 2500 2750
-Wire Wire Line
-	12450 7650 12450 7850
-Wire Wire Line
-	2300 2050 2300 2200
-Wire Wire Line
-	6700 6850 6700 7100
-Wire Wire Line
-	7250 1350 7250 2000
-Wire Wire Line
-	10400 7050 10050 7050
-Wire Wire Line
-	9650 9450 9650 9150
-Wire Wire Line
-	1800 8650 1800 8400
-Wire Wire Line
-	7500 3550 7500 4150
-Wire Wire Line
-	7500 4150 7650 4150
-Wire Wire Line
-	2450 1500 2450 2000
-Wire Wire Line
-	5050 6800 5050 6500
-Wire Wire Line
-	8750 3550 8750 3200
-Wire Wire Line
-	12800 9450 12800 9050
-Wire Wire Line
-	14000 6950 14000 7800
-Connection ~ 12300 7300
-Wire Wire Line
-	12300 7350 12300 6600
-Wire Wire Line
-	12300 7350 12250 7350
-Connection ~ 8600 5300
-Wire Wire Line
-	8600 5300 8600 5650
-Wire Wire Line
-	8600 5650 9000 5650
-Wire Wire Line
-	14950 7250 14600 7250
-Wire Wire Line
-	14950 7150 14500 7150
-Wire Wire Line
-	2300 2200 3200 2200
-Connection ~ 2450 1600
-Wire Wire Line
-	12250 6050 12650 6050
-Connection ~ 2500 2750
-Wire Notes Line
-	14200 9100 14200 8100
-Wire Notes Line
-	14200 9100 15850 9100
-Wire Notes Line
-	15850 9100 15850 8100
-Wire Notes Line
-	15850 8100 14200 8100
-Wire Wire Line
-	12450 6500 12450 6450
-Wire Wire Line
-	14600 6100 14050 6100
-Connection ~ 2500 2200
-Connection ~ 12800 9300
-Connection ~ 12800 10000
-Wire Wire Line
-	13300 9300 13300 9450
-Wire Wire Line
-	14300 9300 14300 9450
-Wire Wire Line
-	15300 9450 15300 9300
-Connection ~ 13800 9300
-Connection ~ 14800 9300
-Connection ~ 14300 10000
-Wire Wire Line
-	14300 10000 14300 9850
-Connection ~ 13300 10000
-Wire Wire Line
-	13300 10000 13300 9850
-Wire Wire Line
-	15300 9300 12800 9300
-Wire Wire Line
-	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
-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 2800 2500 2650
-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
-Connection ~ 3000 2200
-Wire Wire Line
-	2900 2000 3000 2000
-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
-Connection ~ 12450 7800
-Wire Wire Line
-	12450 7850 12250 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
-	14000 7800 13900 7800
-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
-	12300 7300 12250 7300
-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 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
-	8000 6150 8150 6150
-Connection ~ 8800 6850
-Wire Wire Line
-	9300 6850 8550 6850
-Connection ~ 9200 6850
-Wire Wire Line
-	8800 6800 8800 6850
-Wire Wire Line
-	9200 6850 9200 6750
-Wire Wire Line
-	9650 6000 9650 5900
-Wire Wire Line
-	8500 2250 8500 1550
-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
-	8150 4670 8150 4720
-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
-	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
-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
-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
-Connection ~ 4300 5050
-Connection ~ 1800 8600
-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 6700 4700 6800
-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 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
-	4100 6700 5050 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
-	2900 7350 2900 7400
-Wire Wire Line
-	8750 4050 8750 4150
-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 7750 6700 7750
-Wire Wire Line
-	6700 7900 6700 7600
-Connection ~ 6700 7750
-Wire Wire Line
-	8500 2850 8500 2650
-Wire Wire Line
-	6700 8300 6700 8400
-Wire Wire Line
-	6350 4850 6350 4800
-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 6250 9200 6150
-Wire Wire Line
-	8800 6150 8800 6200
-Connection ~ 9200 6150
-Wire Wire Line
-	10400 6150 8550 6150
-Connection ~ 8800 6150
-Wire Wire Line
-	8150 6850 8000 6850
-Wire Wire Line
-	9250 5950 9250 6000
-Connection ~ 9650 6000
-Wire Wire Line
-	8500 5300 8650 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
-Connection ~ 10300 6650
-Wire Wire Line
-	10300 7250 10400 7250
-Connection ~ 10300 7250
-Wire Wire Line
-	10300 7150 10400 7150
-Connection ~ 10300 7150
-Connection ~ 10300 7050
-Wire Wire Line
-	9250 7450 9250 7500
-Connection ~ 9250 7450
-Connection ~ 9250 8050
-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
-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 7800 13100 7850
-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
-	2900 9250 2900 9300
-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
-	5100 3550 5200 3550
-Wire Wire Line
-	3000 1850 3000 2200
-Connection ~ 3000 2000
-Wire Wire Line
-	2450 2000 2500 2000
-Wire Wire Line
-	2450 1600 2950 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
-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
-	8750 3450 9050 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 6750
-Wire Wire Line
-	12350 6400 12250 6400
-Wire Wire Line
-	2500 2250 2500 2200
-Wire Wire Line
-	15500 6100 15500 6600
-Wire Wire Line
-	15500 6600 14450 6600
-Connection ~ 14450 6600
-Wire Wire Line
-	8550 6500 8100 6500
-Wire Wire Line
-	8100 6500 8100 6150
-Connection ~ 8100 6150
-Wire Wire Line
-	13200 6500 12950 6500
-Wire Wire Line
-	10400 6650 10150 6650
-Wire Wire Line
-	2050 5100 2050 4850
-Wire Wire Line
-	1800 6750 1800 6550
-Wire Wire Line
-	5050 8700 5050 8350
-Wire Wire Line
-	8750 7500 8750 7300
-Wire Wire Line
-	4300 5100 4300 4750
-Wire Wire Line
-	6700 5400 6700 4550
-Wire Wire Line
-	5750 3250 5750 3050
-Wire Wire Line
-	4900 2250 4900 1900
+	8900 2100 8900 2250
 Wire Wire Line
 	13950 5500 13900 5500
 Wire Wire Line
-	8900 2250 8900 2100
+	4900 2250 4900 1900
 Wire Wire Line
-	8900 2100 8500 2100
-Connection ~ 8500 2100
+	5750 3050 5750 3250
+Wire Wire Line
+	6700 5400 6700 4550
+Wire Wire Line
+	4300 5100 4300 4750
+Wire Wire Line
+	8750 7500 8750 7300
+Wire Wire Line
+	5050 8700 5050 8350
+Wire Wire Line
+	1800 6750 1800 6550
+Wire Wire Line
+	2050 5100 2050 4850
+Wire Wire Line
+	10400 6650 10150 6650
+Wire Wire Line
+	13200 6500 12950 6500
+Connection ~ 8100 6150
+Wire Wire Line
+	8100 6150 8100 6500
+Wire Wire Line
+	8100 6500 8550 6500
+Connection ~ 14450 6600
+Wire Wire Line
+	14450 6600 15500 6600
+Wire Wire Line
+	15500 6600 15500 6100
+Wire Wire Line
+	2500 2250 2500 2200
+Wire Wire Line
+	12350 6400 12250 6400
+Wire Wire Line
+	14450 6750 14450 6300
+Wire Wire Line
+	14450 6300 14600 6300
+Wire Wire Line
+	14600 5900 14050 5900
+Wire Notes Line
+	14800 5150 10600 5150
+Wire Notes Line
+	14800 5150 14800 1000
+Wire Notes Line
+	14800 1000 10600 1000
+Wire Wire Line
+	9650 10100 9650 9850
+Wire Wire Line
+	10650 9300 10650 9450
+Wire Wire Line
+	11650 9300 11650 9450
+Connection ~ 10150 9300
+Connection ~ 11150 9300
+Connection ~ 11650 10000
+Wire Wire Line
+	11650 10000 11650 9850
+Connection ~ 10650 10000
+Wire Wire Line
+	10650 10000 10650 9850
+Wire Wire Line
+	9650 10000 12150 10000
+Wire Wire Line
+	12150 10000 12150 9850
+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
+Wire Wire Line
+	8750 3450 9050 3450
+Wire Wire Line
+	10400 8200 10350 8200
+Connection ~ 10350 8150
+Wire Wire Line
+	10350 8200 10350 8150
+Wire Wire Line
+	8750 7450 10200 7450
+Wire Wire Line
+	4650 2200 4650 1600
+Wire Wire Line
+	2400 3750 1700 3750
+Wire Wire Line
+	2650 3300 2650 3450
+Connection ~ 2950 2700
+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
+	2450 1600 2950 1600
+Wire Wire Line
+	2500 2000 2450 2000
+Connection ~ 3000 2000
+Wire Wire Line
+	3000 1850 3000 2200
+Wire Wire Line
+	5100 3550 5200 3550
+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
+	2900 9250 2900 9300
+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
+	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
+Connection ~ 9250 8050
+Connection ~ 9250 7450
+Wire Wire Line
+	9250 7450 9250 7500
+Connection ~ 10300 7050
+Connection ~ 10300 7150
+Wire Wire Line
+	10300 7150 10400 7150
+Connection ~ 10300 7250
+Wire Wire Line
+	10300 7250 10400 7250
+Connection ~ 10300 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
+	8500 5300 8650 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
+Wire Wire Line
+	6350 4800 6350 4850
+Wire Wire Line
+	6700 8300 6700 8400
+Wire Wire Line
+	8500 2850 8500 2650
+Connection ~ 6700 7750
+Wire Wire Line
+	6700 7900 6700 7600
+Wire Wire Line
+	5950 7750 6700 7750
+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
+	8750 4050 8750 4150
+Wire Wire Line
+	2900 7350 2900 7400
+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
+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 8800 4250 8600
+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
+Connection ~ 1800 8600
+Connection ~ 4300 5050
+Wire Wire Line
+	4150 5050 4300 5050
+Wire Wire Line
+	3750 5050 3650 5050
+Wire Wire Line
+	3150 5700 3150 5750
+Wire Wire Line
+	2650 5050 2050 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
+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 8600 4700 8700
+Connection ~ 4250 8600
+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
+	8900 4150 8650 4150
+Connection ~ 8750 4150
+Wire Wire Line
+	7650 1550 7250 1550
+Connection ~ 7250 1550
+Connection ~ 8500 2000
+Wire Wire Line
+	8150 4670 8150 4720
+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
+	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
+	8000 6150 8150 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 6150 12650 6150
+Wire Wire Line
+	12250 6450 12450 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 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
+	13900 7800 14000 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
+	12250 7850 12450 7850
+Connection ~ 12450 7800
+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
+	2900 2000 3000 2000
+Connection ~ 3000 2200
+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 2800 2500 2650
+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
+Connection ~ 9650 9300
+Wire Wire Line
+	12800 10100 12800 9850
+Wire Wire Line
+	13800 9300 13800 9450
+Wire Wire Line
+	14800 9300 14800 9450
+Connection ~ 13300 9300
+Connection ~ 14300 9300
+Connection ~ 14800 10000
+Wire Wire Line
+	14800 10000 14800 9850
+Connection ~ 13800 10000
+Wire Wire Line
+	13800 10000 13800 9850
+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
+Wire Wire Line
+	14300 9300 14300 9450
+Wire Wire Line
+	13300 9300 13300 9450
+Connection ~ 12800 10000
+Connection ~ 12800 9300
+Connection ~ 2500 2200
+Wire Wire Line
+	14600 6100 14050 6100
+Wire Wire Line
+	12450 6450 12450 6500
+Wire Notes Line
+	15850 8100 14200 8100
+Wire Notes Line
+	15850 8100 15850 9100
+Wire Notes Line
+	15850 9100 14200 9100
+Wire Notes Line
+	14200 9100 14200 8100
+Connection ~ 2500 2750
+Wire Wire Line
+	12250 6050 12650 6050
+Connection ~ 2450 1600
+Wire Wire Line
+	3200 2200 2300 2200
+Wire Wire Line
+	9000 5650 8600 5650
+Wire Wire Line
+	8600 5650 8600 5300
+Connection ~ 8600 5300
+Wire Wire Line
+	12250 7350 12300 7350
+Wire Wire Line
+	12300 7350 12300 6600
+Connection ~ 12300 7300
+Wire Wire Line
+	14000 7800 14000 6950
+Wire Wire Line
+	12800 9450 12800 9050
+Wire Wire Line
+	8750 3550 8750 3200
+Wire Wire Line
+	5050 6800 5050 6500
+Wire Wire Line
+	2450 2000 2450 1500
+Wire Wire Line
+	7650 4150 7500 4150
+Wire Wire Line
+	7500 4150 7500 3550
+Wire Wire Line
+	1800 8650 1800 8400
+Wire Wire Line
+	9650 9450 9650 9150
+Wire Wire Line
+	10400 7050 10050 7050
+Wire Wire Line
+	7250 2000 7250 1350
+Wire Wire Line
+	6700 6850 6700 7100
+Wire Wire Line
+	2300 2200 2300 2050
+Wire Wire Line
+	12450 7850 12450 7650
+Wire Wire Line
+	1900 2750 2500 2750
+Wire Wire Line
+	13300 5500 13300 5750
+Wire Wire Line
+	14450 5500 14500 5500
+Wire Wire Line
+	14500 5500 14500 5900
+Connection ~ 14500 5900
+Wire Wire Line
+	8900 2650 8900 2850
+Wire Wire Line
+	8900 2850 7900 2850
+Connection ~ 8500 2850
+Wire Wire Line
+	13600 6400 13450 6400
+Wire Wire Line
+	13450 6400 13450 6300
+Wire Wire Line
+	14650 7350 14650 7550
+Wire Wire Line
+	15050 7250 14600 7250
+$Comp
+L SWITCH SW1
+U 1 1 4B13DABF
+P 15500 7250
+F 0 "SW1" H 15500 7000 60  0000 C C
+F 1 "SWITCH" H 15500 7500 60  0000 C C
+	1    15500 7250
+	1    0    0    -1  
+$EndComp
+Kmarq B 14950 7350 "Warning: Pin 3state connected to Pin power_in (net 2)" F=1
+Kmarq B 14650 7550 "Warning Pin power_in not driven (Net 2)" F=1
+Kmarq B 14650 7550 "Warning: Pin power_in connected to Pin 3state (net 2)" F=1
 $Comp
 L C C74
 U 1 1 4B132AB9
@@ -901,15 +913,6 @@ F 1 "GND" H 14450 6680 30  0001 C C
 $EndComp
 Text Label 14500 7150 0    30   ~
 BOOT_SEL1_HIGH
-$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 13600 6400 0    30   ~
 BOOT_SEL1_HIGH
 Text Label 12350 6400 0    30   ~
diff --git a/main/Qi_AVT2.cache.bck b/main/Qi_AVT2.cache.bck
index 6faf0d5..a25dd34 100644
--- a/main/Qi_AVT2.cache.bck
+++ b/main/Qi_AVT2.cache.bck
@@ -1,3 +1,3 @@
-EESchema-DOCLIB  Version 2.0  30/11/2009-02:49:13
+EESchema-DOCLIB  Version 2.0  30/11/2009-14:48:25
 #
 #End Doc Library
diff --git a/main/Qi_AVT2.cache.lib b/main/Qi_AVT2.cache.lib
index 12ac558..ce5f993 100644
--- a/main/Qi_AVT2.cache.lib
+++ b/main/Qi_AVT2.cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version  30/11/2009-02:49:13
+EESchema-LIBRARY Version  30/11/2009-14:48:25
 #
 #
 # 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
@@ -507,9 +507,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
@@ -668,11 +668,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
@@ -811,9 +811,9 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S 150 -200 -150 200 0 1 0 N
-X 1 1 -450 -100 300 R 50 50 1 1 I
-X 2 2 -450 0 300 R 50 50 1 1 I
-X 3 3 -450 100 300 R 50 50 1 1 I
+X 1 1 -450 -100 300 R 50 50 1 1 O
+X 2 2 -450 0 300 R 50 50 1 1 B
+X 3 3 -450 100 300 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
diff --git a/main/Qi_AVT2.erc b/main/Qi_AVT2.erc
index 7f05e53..e6fa9b0 100644
--- a/main/Qi_AVT2.erc
+++ b/main/Qi_AVT2.erc
@@ -1,7 +1,6 @@
-ERC control (29/10/2009-19:38:30)
+ERC control (30/11/2009-14:48:03)
 
 ***** Sheet / (Root) 
-ERC: Warning Pin power_in not driven (Net 2) (X= 14.650 inches, Y= 7.500 inches
 
 ***** Sheet /LCD_USB/
 ERC: Warning Pin input Unconnected (X= 3.950 inches, Y= 2.200 inches
@@ -19,4 +18,4 @@ ERC: Warning Pin input Unconnected (X= 3.950 inches, Y= 2.250 inches
 
 ***** Sheet /KEY_MATRIX/
 
- >> Errors ERC: 5
+ >> Errors ERC: 4
diff --git a/main/Qi_AVT2.sch b/main/Qi_AVT2.sch
index 9cf6c12..6f0a283 100644
--- a/main/Qi_AVT2.sch
+++ b/main/Qi_AVT2.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
@@ -14,733 +14,742 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	13450 6300 13450 6400
+	15050 7350 14650 7350
 Wire Wire Line
-	13450 6400 13600 6400
-Connection ~ 8500 2850
+	15050 7150 14500 7150
+Connection ~ 8500 2100
 Wire Wire Line
-	7900 2850 8900 2850
+	8500 2100 8900 2100
 Wire Wire Line
-	8900 2850 8900 2650
-Wire Wire Line
-	14650 7550 14650 7350
-Wire Wire Line
-	14650 7350 14950 7350
-Connection ~ 14500 5900
-Wire Wire Line
-	14500 5900 14500 5500
-Wire Wire Line
-	14500 5500 14450 5500
-Wire Wire Line
-	13300 5500 13300 5750
-Wire Wire Line
-	1900 2750 2500 2750
-Wire Wire Line
-	12450 7650 12450 7850
-Wire Wire Line
-	2300 2050 2300 2200
-Wire Wire Line
-	6700 6850 6700 7100
-Wire Wire Line
-	7250 1350 7250 2000
-Wire Wire Line
-	10400 7050 10050 7050
-Wire Wire Line
-	9650 9450 9650 9150
-Wire Wire Line
-	1800 8650 1800 8400
-Wire Wire Line
-	7500 3550 7500 4150
-Wire Wire Line
-	7500 4150 7650 4150
-Wire Wire Line
-	2450 1500 2450 2000
-Wire Wire Line
-	5050 6800 5050 6500
-Wire Wire Line
-	8750 3550 8750 3200
-Wire Wire Line
-	12800 9450 12800 9050
-Wire Wire Line
-	14000 6950 14000 7800
-Connection ~ 12300 7300
-Wire Wire Line
-	12300 7350 12300 6600
-Wire Wire Line
-	12300 7350 12250 7350
-Connection ~ 8600 5300
-Wire Wire Line
-	8600 5300 8600 5650
-Wire Wire Line
-	8600 5650 9000 5650
-Wire Wire Line
-	14950 7250 14600 7250
-Wire Wire Line
-	14950 7150 14500 7150
-Wire Wire Line
-	2300 2200 3200 2200
-Connection ~ 2450 1600
-Wire Wire Line
-	12250 6050 12650 6050
-Connection ~ 2500 2750
-Wire Notes Line
-	14200 9100 14200 8100
-Wire Notes Line
-	14200 9100 15850 9100
-Wire Notes Line
-	15850 9100 15850 8100
-Wire Notes Line
-	15850 8100 14200 8100
-Wire Wire Line
-	12450 6500 12450 6450
-Wire Wire Line
-	14600 6100 14050 6100
-Connection ~ 2500 2200
-Connection ~ 12800 9300
-Connection ~ 12800 10000
-Wire Wire Line
-	13300 9300 13300 9450
-Wire Wire Line
-	14300 9300 14300 9450
-Wire Wire Line
-	15300 9450 15300 9300
-Connection ~ 13800 9300
-Connection ~ 14800 9300
-Connection ~ 14300 10000
-Wire Wire Line
-	14300 10000 14300 9850
-Connection ~ 13300 10000
-Wire Wire Line
-	13300 10000 13300 9850
-Wire Wire Line
-	15300 9300 12800 9300
-Wire Wire Line
-	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
-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 2800 2500 2650
-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
-Connection ~ 3000 2200
-Wire Wire Line
-	2900 2000 3000 2000
-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
-Connection ~ 12450 7800
-Wire Wire Line
-	12450 7850 12250 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
-	14000 7800 13900 7800
-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
-	12300 7300 12250 7300
-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 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
-	8000 6150 8150 6150
-Connection ~ 8800 6850
-Wire Wire Line
-	9300 6850 8550 6850
-Connection ~ 9200 6850
-Wire Wire Line
-	8800 6800 8800 6850
-Wire Wire Line
-	9200 6850 9200 6750
-Wire Wire Line
-	9650 6000 9650 5900
-Wire Wire Line
-	8500 2250 8500 1550
-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
-	8150 4670 8150 4720
-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
-	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
-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
-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
-Connection ~ 4300 5050
-Connection ~ 1800 8600
-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 6700 4700 6800
-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 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
-	4100 6700 5050 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
-	2900 7350 2900 7400
-Wire Wire Line
-	8750 4050 8750 4150
-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 7750 6700 7750
-Wire Wire Line
-	6700 7900 6700 7600
-Connection ~ 6700 7750
-Wire Wire Line
-	8500 2850 8500 2650
-Wire Wire Line
-	6700 8300 6700 8400
-Wire Wire Line
-	6350 4850 6350 4800
-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 6250 9200 6150
-Wire Wire Line
-	8800 6150 8800 6200
-Connection ~ 9200 6150
-Wire Wire Line
-	10400 6150 8550 6150
-Connection ~ 8800 6150
-Wire Wire Line
-	8150 6850 8000 6850
-Wire Wire Line
-	9250 5950 9250 6000
-Connection ~ 9650 6000
-Wire Wire Line
-	8500 5300 8650 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
-Connection ~ 10300 6650
-Wire Wire Line
-	10300 7250 10400 7250
-Connection ~ 10300 7250
-Wire Wire Line
-	10300 7150 10400 7150
-Connection ~ 10300 7150
-Connection ~ 10300 7050
-Wire Wire Line
-	9250 7450 9250 7500
-Connection ~ 9250 7450
-Connection ~ 9250 8050
-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
-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 7800 13100 7850
-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
-	2900 9250 2900 9300
-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
-	5100 3550 5200 3550
-Wire Wire Line
-	3000 1850 3000 2200
-Connection ~ 3000 2000
-Wire Wire Line
-	2450 2000 2500 2000
-Wire Wire Line
-	2450 1600 2950 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
-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
-	8750 3450 9050 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 6750
-Wire Wire Line
-	12350 6400 12250 6400
-Wire Wire Line
-	2500 2250 2500 2200
-Wire Wire Line
-	15500 6100 15500 6600
-Wire Wire Line
-	15500 6600 14450 6600
-Connection ~ 14450 6600
-Wire Wire Line
-	8550 6500 8100 6500
-Wire Wire Line
-	8100 6500 8100 6150
-Connection ~ 8100 6150
-Wire Wire Line
-	13200 6500 12950 6500
-Wire Wire Line
-	10400 6650 10150 6650
-Wire Wire Line
-	2050 5100 2050 4850
-Wire Wire Line
-	1800 6750 1800 6550
-Wire Wire Line
-	5050 8700 5050 8350
-Wire Wire Line
-	8750 7500 8750 7300
-Wire Wire Line
-	4300 5100 4300 4750
-Wire Wire Line
-	6700 5400 6700 4550
-Wire Wire Line
-	5750 3250 5750 3050
-Wire Wire Line
-	4900 2250 4900 1900
+	8900 2100 8900 2250
 Wire Wire Line
 	13950 5500 13900 5500
 Wire Wire Line
-	8900 2250 8900 2100
+	4900 2250 4900 1900
 Wire Wire Line
-	8900 2100 8500 2100
-Connection ~ 8500 2100
+	5750 3050 5750 3250
+Wire Wire Line
+	6700 5400 6700 4550
+Wire Wire Line
+	4300 5100 4300 4750
+Wire Wire Line
+	8750 7500 8750 7300
+Wire Wire Line
+	5050 8700 5050 8350
+Wire Wire Line
+	1800 6750 1800 6550
+Wire Wire Line
+	2050 5100 2050 4850
+Wire Wire Line
+	10400 6650 10150 6650
+Wire Wire Line
+	13200 6500 12950 6500
+Connection ~ 8100 6150
+Wire Wire Line
+	8100 6150 8100 6500
+Wire Wire Line
+	8100 6500 8550 6500
+Connection ~ 14450 6600
+Wire Wire Line
+	14450 6600 15500 6600
+Wire Wire Line
+	15500 6600 15500 6100
+Wire Wire Line
+	2500 2250 2500 2200
+Wire Wire Line
+	12350 6400 12250 6400
+Wire Wire Line
+	14450 6750 14450 6300
+Wire Wire Line
+	14450 6300 14600 6300
+Wire Wire Line
+	14600 5900 14050 5900
+Wire Notes Line
+	14800 5150 10600 5150
+Wire Notes Line
+	14800 5150 14800 1000
+Wire Notes Line
+	14800 1000 10600 1000
+Wire Wire Line
+	9650 10100 9650 9850
+Wire Wire Line
+	10650 9300 10650 9450
+Wire Wire Line
+	11650 9300 11650 9450
+Connection ~ 10150 9300
+Connection ~ 11150 9300
+Connection ~ 11650 10000
+Wire Wire Line
+	11650 10000 11650 9850
+Connection ~ 10650 10000
+Wire Wire Line
+	10650 10000 10650 9850
+Wire Wire Line
+	9650 10000 12150 10000
+Wire Wire Line
+	12150 10000 12150 9850
+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
+Wire Wire Line
+	8750 3450 9050 3450
+Wire Wire Line
+	10400 8200 10350 8200
+Connection ~ 10350 8150
+Wire Wire Line
+	10350 8200 10350 8150
+Wire Wire Line
+	8750 7450 10200 7450
+Wire Wire Line
+	4650 2200 4650 1600
+Wire Wire Line
+	2400 3750 1700 3750
+Wire Wire Line
+	2650 3300 2650 3450
+Connection ~ 2950 2700
+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
+	2450 1600 2950 1600
+Wire Wire Line
+	2500 2000 2450 2000
+Connection ~ 3000 2000
+Wire Wire Line
+	3000 1850 3000 2200
+Wire Wire Line
+	5100 3550 5200 3550
+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
+	2900 9250 2900 9300
+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
+	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
+Connection ~ 9250 8050
+Connection ~ 9250 7450
+Wire Wire Line
+	9250 7450 9250 7500
+Connection ~ 10300 7050
+Connection ~ 10300 7150
+Wire Wire Line
+	10300 7150 10400 7150
+Connection ~ 10300 7250
+Wire Wire Line
+	10300 7250 10400 7250
+Connection ~ 10300 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
+	8500 5300 8650 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
+Wire Wire Line
+	6350 4800 6350 4850
+Wire Wire Line
+	6700 8300 6700 8400
+Wire Wire Line
+	8500 2850 8500 2650
+Connection ~ 6700 7750
+Wire Wire Line
+	6700 7900 6700 7600
+Wire Wire Line
+	5950 7750 6700 7750
+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
+	8750 4050 8750 4150
+Wire Wire Line
+	2900 7350 2900 7400
+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
+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 8800 4250 8600
+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
+Connection ~ 1800 8600
+Connection ~ 4300 5050
+Wire Wire Line
+	4150 5050 4300 5050
+Wire Wire Line
+	3750 5050 3650 5050
+Wire Wire Line
+	3150 5700 3150 5750
+Wire Wire Line
+	2650 5050 2050 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
+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 8600 4700 8700
+Connection ~ 4250 8600
+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
+	8900 4150 8650 4150
+Connection ~ 8750 4150
+Wire Wire Line
+	7650 1550 7250 1550
+Connection ~ 7250 1550
+Connection ~ 8500 2000
+Wire Wire Line
+	8150 4670 8150 4720
+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
+	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
+	8000 6150 8150 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 6150 12650 6150
+Wire Wire Line
+	12250 6450 12450 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 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
+	13900 7800 14000 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
+	12250 7850 12450 7850
+Connection ~ 12450 7800
+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
+	2900 2000 3000 2000
+Connection ~ 3000 2200
+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 2800 2500 2650
+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
+Connection ~ 9650 9300
+Wire Wire Line
+	12800 10100 12800 9850
+Wire Wire Line
+	13800 9300 13800 9450
+Wire Wire Line
+	14800 9300 14800 9450
+Connection ~ 13300 9300
+Connection ~ 14300 9300
+Connection ~ 14800 10000
+Wire Wire Line
+	14800 10000 14800 9850
+Connection ~ 13800 10000
+Wire Wire Line
+	13800 10000 13800 9850
+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
+Wire Wire Line
+	14300 9300 14300 9450
+Wire Wire Line
+	13300 9300 13300 9450
+Connection ~ 12800 10000
+Connection ~ 12800 9300
+Connection ~ 2500 2200
+Wire Wire Line
+	14600 6100 14050 6100
+Wire Wire Line
+	12450 6450 12450 6500
+Wire Notes Line
+	15850 8100 14200 8100
+Wire Notes Line
+	15850 8100 15850 9100
+Wire Notes Line
+	15850 9100 14200 9100
+Wire Notes Line
+	14200 9100 14200 8100
+Connection ~ 2500 2750
+Wire Wire Line
+	12250 6050 12650 6050
+Connection ~ 2450 1600
+Wire Wire Line
+	3200 2200 2300 2200
+Wire Wire Line
+	9000 5650 8600 5650
+Wire Wire Line
+	8600 5650 8600 5300
+Connection ~ 8600 5300
+Wire Wire Line
+	12250 7350 12300 7350
+Wire Wire Line
+	12300 7350 12300 6600
+Connection ~ 12300 7300
+Wire Wire Line
+	14000 7800 14000 6950
+Wire Wire Line
+	12800 9450 12800 9050
+Wire Wire Line
+	8750 3550 8750 3200
+Wire Wire Line
+	5050 6800 5050 6500
+Wire Wire Line
+	2450 2000 2450 1500
+Wire Wire Line
+	7650 4150 7500 4150
+Wire Wire Line
+	7500 4150 7500 3550
+Wire Wire Line
+	1800 8650 1800 8400
+Wire Wire Line
+	9650 9450 9650 9150
+Wire Wire Line
+	10400 7050 10050 7050
+Wire Wire Line
+	7250 2000 7250 1350
+Wire Wire Line
+	6700 6850 6700 7100
+Wire Wire Line
+	2300 2200 2300 2050
+Wire Wire Line
+	12450 7850 12450 7650
+Wire Wire Line
+	1900 2750 2500 2750
+Wire Wire Line
+	13300 5500 13300 5750
+Wire Wire Line
+	14450 5500 14500 5500
+Wire Wire Line
+	14500 5500 14500 5900
+Connection ~ 14500 5900
+Wire Wire Line
+	8900 2650 8900 2850
+Wire Wire Line
+	8900 2850 7900 2850
+Connection ~ 8500 2850
+Wire Wire Line
+	13600 6400 13450 6400
+Wire Wire Line
+	13450 6400 13450 6300
+Wire Wire Line
+	14650 7350 14650 7550
+Wire Wire Line
+	15050 7250 14600 7250
+$Comp
+L SWITCH SW1
+U 1 1 4B13DABF
+P 15500 7250
+F 0 "SW1" H 15500 7000 60  0000 C C
+F 1 "SWITCH" H 15500 7500 60  0000 C C
+	1    15500 7250
+	1    0    0    -1  
+$EndComp
 $Comp
 L C C74
 U 1 1 4B132AB9
@@ -901,15 +910,6 @@ F 1 "GND" H 14450 6680 30  0001 C C
 $EndComp
 Text Label 14500 7150 0    30   ~
 BOOT_SEL1_HIGH
-$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 13600 6400 0    30   ~
 BOOT_SEL1_HIGH
 Text Label 12350 6400 0    30   ~
diff --git a/main/audio.bak b/main/audio.bak
index 457a393..84f6db0 100644
--- a/main/audio.bak
+++ b/main/audio.bak
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/audio.sch b/main/audio.sch
index 457a393..84f6db0 100644
--- a/main/audio.sch
+++ b/main/audio.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/function_block.bak b/main/function_block.bak
index 181f0f0..0190376 100644
--- a/main/function_block.bak
+++ b/main/function_block.bak
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/function_block.sch b/main/function_block.sch
index 181f0f0..0190376 100644
--- a/main/function_block.sch
+++ b/main/function_block.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/key_matrix.bak b/main/key_matrix.bak
index c8604ed..242ef6f 100644
--- a/main/key_matrix.bak
+++ b/main/key_matrix.bak
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/key_matrix.sch b/main/key_matrix.sch
index c8604ed..242ef6f 100644
--- a/main/key_matrix.sch
+++ b/main/key_matrix.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/lcd_usb.bak b/main/lcd_usb.bak
index 4c1329a..045d49f 100644
--- a/main/lcd_usb.bak
+++ b/main/lcd_usb.bak
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/lcd_usb.sch b/main/lcd_usb.sch
index 4c1329a..045d49f 100644
--- a/main/lcd_usb.sch
+++ b/main/lcd_usb.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/memory.bak b/main/memory.bak
index f5a57d5..38eb9a1 100644
--- a/main/memory.bak
+++ b/main/memory.bak
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/memory.sch b/main/memory.sch
index f5a57d5..38eb9a1 100644
--- a/main/memory.sch
+++ b/main/memory.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/power_tree.bak b/main/power_tree.bak
index 343645f..3284454 100644
--- a/main/power_tree.bak
+++ b/main/power_tree.bak
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
diff --git a/main/power_tree.sch b/main/power_tree.sch
index 343645f..3284454 100644
--- a/main/power_tree.sch
+++ b/main/power_tree.sch
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 2
-LIBS:vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
+LIBS:power,vrtc,vddhp,vbus,vbato,vbat,v33sd,v33,v18,usb_minib,usb_micro_ab,usbdf,tm2302n,tm2301n,testpoint,sw_metaldomn,switch,spy0030a,speaker,solderpaste,serial_con,se9016,sdcw2012,scic,pwr_flag,phonejack,p3v56s40etp-g6,npn,ms_1d77,microphone,lt3925edcb,kb3436,jz4720_186p,inductorp,inductor,hy27ug088g5m,hd,fpccon24,eup3406,crystal,cpolarized,boot_switch,bl8555-33pra,bl8509-263dnrm,bl8506-30nrm,bat_con,./Qi_AVT2.cache
 EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267