diff --git a/sym-lib-table b/sym-lib-table
index 4d120bb..4644048 100644
--- a/sym-lib-table
+++ b/sym-lib-table
@@ -22,4 +22,5 @@
   (lib (name SOYO-BT24G03)(type Legacy)(uri ${KIPRJMOD}/libs/library/SOYO-BT24G03.lib)(options "")(descr ""))
   (lib (name xs3868)(type Legacy)(uri ${KIPRJMOD}/libs/library/xs3868.lib)(options "")(descr ""))
   (lib (name YAAJ_STM32)(type Legacy)(uri ${KIPRJMOD}/libs/Kicad-STM32-master/Symbols/YAAJ_STM32.lib)(options "")(descr ""))
+  (lib (name usb_switcher-rescue)(type Legacy)(uri ${KIPRJMOD}/usb_switcher-rescue.lib)(options "")(descr ""))
 )
diff --git a/uC.sch b/uC.sch
index e77d636..b4b367e 100644
--- a/uC.sch
+++ b/uC.sch
@@ -121,33 +121,33 @@ CAN IF\n
 $Comp
 L Device:C C?
 U 1 1 5FD0400D
-P 8250 4300
+P 8300 4300
 AR Path="/5FD0400D" Ref="C?"  Part="1" 
 AR Path="/5FCC1275/5FD0400D" Ref="C11"  Part="1" 
-F 0 "C11" V 7998 4300 50  0000 C CNN
-F 1 "C" V 8089 4300 50  0000 C CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8288 4150 50  0001 C CNN
-F 3 "~" H 8250 4300 50  0001 C CNN
-	1    8250 4300
+F 0 "C11" V 8048 4300 50  0000 C CNN
+F 1 "100n" V 8139 4300 50  0000 C CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8338 4150 50  0001 C CNN
+F 3 "~" H 8300 4300 50  0001 C CNN
+	1    8300 4300
 	0    1    1    0   
 $EndComp
 $Comp
 L power:+5V #PWR?
 U 1 1 5FD04013
-P 7900 4200
+P 7950 4200
 AR Path="/5FD04013" Ref="#PWR?"  Part="1" 
 AR Path="/5FCC1275/5FD04013" Ref="#PWR037"  Part="1" 
-F 0 "#PWR037" H 7900 4050 50  0001 C CNN
-F 1 "+5V" H 7915 4373 50  0000 C CNN
-F 2 "" H 7900 4200 50  0001 C CNN
-F 3 "" H 7900 4200 50  0001 C CNN
-	1    7900 4200
+F 0 "#PWR037" H 7950 4050 50  0001 C CNN
+F 1 "+5V" H 7965 4373 50  0000 C CNN
+F 2 "" H 7950 4200 50  0001 C CNN
+F 3 "" H 7950 4200 50  0001 C CNN
+	1    7950 4200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	7900 4200 7900 4300
+	7950 4200 7950 4300
 Wire Wire Line
-	7900 4300 8100 4300
+	7950 4300 8150 4300
 $Comp
 L power:GND #PWR?
 U 1 1 5FD0401B
@@ -161,8 +161,6 @@ F 3 "" H 8700 4300 50  0001 C CNN
 	1    8700 4300
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	8400 4300 8700 4300
 $Comp
 L Connector:DB9_Male J?
 U 1 1 5FD04022
@@ -458,7 +456,7 @@ L Device:C C6
 U 1 1 5FE7A2DB
 P 2650 1300
 F 0 "C6" H 2765 1346 50  0000 L CNN
-F 1 "C" H 2765 1255 50  0000 L CNN
+F 1 "100n" H 2765 1255 50  0000 L CNN
 F 2 "" H 2688 1150 50  0001 C CNN
 F 3 "~" H 2650 1300 50  0001 C CNN
 	1    2650 1300
@@ -857,4 +855,36 @@ Wire Wire Line
 	2250 1350 2300 1350
 Text Label 5650 4800 0    47   ~ 0
 SWIO
+$Comp
+L Power_Protection:SZNUP2105L D?
+U 1 1 5F7DECD3
+P 9200 5850
+F 0 "D?" H 9405 5896 50  0000 L CNN
+F 1 "SZNUP2105L" H 9405 5805 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 9425 5800 50  0001 L CNN
+F 3 "http://www.onsemi.com/pub_link/Collateral/NUP2105L-D.PDF" H 9325 5975 50  0001 C CNN
+	1    9200 5850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9300 5400 9300 5650
+Wire Wire Line
+	9100 5200 9100 5650
+$Comp
+L power:GND #PWR?
+U 1 1 5F7E76CB
+P 9200 6150
+AR Path="/5F7E76CB" Ref="#PWR?"  Part="1" 
+AR Path="/5FCC1275/5F7E76CB" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 9200 5900 50  0001 C CNN
+F 1 "GND" H 9205 5977 50  0000 C CNN
+F 2 "" H 9200 6150 50  0001 C CNN
+F 3 "" H 9200 6150 50  0001 C CNN
+	1    9200 6150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9200 6050 9200 6150
+Wire Wire Line
+	8450 4300 8700 4300
 $EndSCHEMATC
diff --git a/uC.sch-bak b/uC.sch-bak
index b5338e4..6f59450 100644
--- a/uC.sch-bak
+++ b/uC.sch-bak
@@ -31,8 +31,8 @@ L power:GND #PWR?
 U 1 1 5FD03FD6
 P 8300 5800
 AR Path="/5FD03FD6" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FD03FD6" Ref="#PWR037"  Part="1" 
-F 0 "#PWR037" H 8300 5550 50  0001 C CNN
+AR Path="/5FCC1275/5FD03FD6" Ref="#PWR040"  Part="1" 
+F 0 "#PWR040" H 8300 5550 50  0001 C CNN
 F 1 "GND" H 8305 5627 50  0000 C CNN
 F 2 "" H 8300 5800 50  0001 C CNN
 F 3 "" H 8300 5800 50  0001 C CNN
@@ -46,8 +46,8 @@ L power:+5V #PWR?
 U 1 1 5FD03FDD
 P 8300 4650
 AR Path="/5FD03FDD" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FD03FDD" Ref="#PWR036"  Part="1" 
-F 0 "#PWR036" H 8300 4500 50  0001 C CNN
+AR Path="/5FCC1275/5FD03FDD" Ref="#PWR039"  Part="1" 
+F 0 "#PWR039" H 8300 4500 50  0001 C CNN
 F 1 "+5V" H 8315 4823 50  0000 C CNN
 F 2 "" H 8300 4650 50  0001 C CNN
 F 3 "" H 8300 4650 50  0001 C CNN
@@ -99,8 +99,8 @@ L power:+3.3V #PWR?
 U 1 1 5FD03FF6
 P 7700 5350
 AR Path="/5FD03FF6" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FD03FF6" Ref="#PWR034"  Part="1" 
-F 0 "#PWR034" H 7700 5200 50  0001 C CNN
+AR Path="/5FCC1275/5FD03FF6" Ref="#PWR036"  Part="1" 
+F 0 "#PWR036" H 7700 5200 50  0001 C CNN
 F 1 "+3.3V" H 7550 5350 50  0000 C CNN
 F 2 "" H 7700 5350 50  0001 C CNN
 F 3 "" H 7700 5350 50  0001 C CNN
@@ -123,9 +123,9 @@ L Device:C C?
 U 1 1 5FD0400D
 P 8250 4300
 AR Path="/5FD0400D" Ref="C?"  Part="1" 
-AR Path="/5FCC1275/5FD0400D" Ref="C7"  Part="1" 
-F 0 "C7" V 7998 4300 50  0000 C CNN
-F 1 "C" V 8089 4300 50  0000 C CNN
+AR Path="/5FCC1275/5FD0400D" Ref="C11"  Part="1" 
+F 0 "C11" V 7998 4300 50  0000 C CNN
+F 1 "100n" V 8089 4300 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 8288 4150 50  0001 C CNN
 F 3 "~" H 8250 4300 50  0001 C CNN
 	1    8250 4300
@@ -136,8 +136,8 @@ L power:+5V #PWR?
 U 1 1 5FD04013
 P 7900 4200
 AR Path="/5FD04013" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FD04013" Ref="#PWR035"  Part="1" 
-F 0 "#PWR035" H 7900 4050 50  0001 C CNN
+AR Path="/5FCC1275/5FD04013" Ref="#PWR037"  Part="1" 
+F 0 "#PWR037" H 7900 4050 50  0001 C CNN
 F 1 "+5V" H 7915 4373 50  0000 C CNN
 F 2 "" H 7900 4200 50  0001 C CNN
 F 3 "" H 7900 4200 50  0001 C CNN
@@ -153,8 +153,8 @@ L power:GND #PWR?
 U 1 1 5FD0401B
 P 8700 4300
 AR Path="/5FD0401B" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FD0401B" Ref="#PWR038"  Part="1" 
-F 0 "#PWR038" H 8700 4050 50  0001 C CNN
+AR Path="/5FCC1275/5FD0401B" Ref="#PWR041"  Part="1" 
+F 0 "#PWR041" H 8700 4050 50  0001 C CNN
 F 1 "GND" H 8705 4127 50  0000 C CNN
 F 2 "" H 8700 4300 50  0001 C CNN
 F 3 "" H 8700 4300 50  0001 C CNN
@@ -181,8 +181,8 @@ L power:GND #PWR?
 U 1 1 5FD04028
 P 9750 5200
 AR Path="/5FD04028" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FD04028" Ref="#PWR042"  Part="1" 
-F 0 "#PWR042" H 9750 4950 50  0001 C CNN
+AR Path="/5FCC1275/5FD04028" Ref="#PWR045"  Part="1" 
+F 0 "#PWR045" H 9750 4950 50  0001 C CNN
 F 1 "GND" H 9755 5027 50  0000 C CNN
 F 2 "" H 9750 5200 50  0001 C CNN
 F 3 "" H 9750 5200 50  0001 C CNN
@@ -242,8 +242,8 @@ L power:GND #PWR?
 U 1 1 5FD04051
 P 4850 5450
 AR Path="/5FD04051" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FD04051" Ref="#PWR031"  Part="1" 
-F 0 "#PWR031" H 4850 5200 50  0001 C CNN
+AR Path="/5FCC1275/5FD04051" Ref="#PWR032"  Part="1" 
+F 0 "#PWR032" H 4850 5200 50  0001 C CNN
 F 1 "GND" H 4855 5277 50  0000 C CNN
 F 2 "" H 4850 5450 50  0001 C CNN
 F 3 "" H 4850 5450 50  0001 C CNN
@@ -274,8 +274,8 @@ L power:+3.3V #PWR?
 U 1 1 5FD04062
 P 4950 2050
 AR Path="/5FD04062" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FD04062" Ref="#PWR032"  Part="1" 
-F 0 "#PWR032" H 4950 1900 50  0001 C CNN
+AR Path="/5FCC1275/5FD04062" Ref="#PWR033"  Part="1" 
+F 0 "#PWR033" H 4950 1900 50  0001 C CNN
 F 1 "+3.3V" H 4965 2223 50  0000 C CNN
 F 2 "" H 4950 2050 50  0001 C CNN
 F 3 "" H 4950 2050 50  0001 C CNN
@@ -353,8 +353,8 @@ L power:+3.3V #PWR?
 U 1 1 5FD04089
 P 8750 1000
 AR Path="/5FD04089" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FD04089" Ref="#PWR040"  Part="1" 
-F 0 "#PWR040" H 8750 850 50  0001 C CNN
+AR Path="/5FCC1275/5FD04089" Ref="#PWR042"  Part="1" 
+F 0 "#PWR042" H 8750 850 50  0001 C CNN
 F 1 "+3.3V" H 8765 1173 50  0000 C CNN
 F 2 "" H 8750 1000 50  0001 C CNN
 F 3 "" H 8750 1000 50  0001 C CNN
@@ -375,8 +375,8 @@ L power:GND #PWR?
 U 1 1 5FD04094
 P 8750 1600
 AR Path="/5FD04094" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FD04094" Ref="#PWR041"  Part="1" 
-F 0 "#PWR041" H 8750 1350 50  0001 C CNN
+AR Path="/5FCC1275/5FD04094" Ref="#PWR043"  Part="1" 
+F 0 "#PWR043" H 8750 1350 50  0001 C CNN
 F 1 "GND" H 8755 1427 50  0000 C CNN
 F 2 "" H 8750 1600 50  0001 C CNN
 F 3 "" H 8750 1600 50  0001 C CNN
@@ -458,7 +458,7 @@ L Device:C C6
 U 1 1 5FE7A2DB
 P 2650 1300
 F 0 "C6" H 2765 1346 50  0000 L CNN
-F 1 "C" H 2765 1255 50  0000 L CNN
+F 1 "100n" H 2765 1255 50  0000 L CNN
 F 2 "" H 2688 1150 50  0001 C CNN
 F 3 "~" H 2650 1300 50  0001 C CNN
 	1    2650 1300
@@ -503,8 +503,8 @@ L power:+3.3V #PWR?
 U 1 1 5FE895F6
 P 8300 2350
 AR Path="/5FE895F6" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FE895F6" Ref="#PWR039"  Part="1" 
-F 0 "#PWR039" H 8300 2200 50  0001 C CNN
+AR Path="/5FCC1275/5FE895F6" Ref="#PWR038"  Part="1" 
+F 0 "#PWR038" H 8300 2200 50  0001 C CNN
 F 1 "+3.3V" H 8315 2523 50  0000 C CNN
 F 2 "" H 8300 2350 50  0001 C CNN
 F 3 "" H 8300 2350 50  0001 C CNN
@@ -518,10 +518,10 @@ Wire Wire Line
 Wire Wire Line
 	8300 2900 8600 2900
 $Comp
-L power:GND #PWR043
+L power:GND #PWR044
 U 1 1 5FE8C286
 P 9300 3150
-F 0 "#PWR043" H 9300 2900 50  0001 C CNN
+F 0 "#PWR044" H 9300 2900 50  0001 C CNN
 F 1 "GND" H 9305 2977 50  0000 C CNN
 F 2 "" H 9300 3150 50  0001 C CNN
 F 3 "" H 9300 3150 50  0001 C CNN
@@ -582,8 +582,8 @@ L power:GND #PWR?
 U 1 1 5FE9A80A
 P 6350 4950
 AR Path="/5FE9A80A" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5FE9A80A" Ref="#PWR033"  Part="1" 
-F 0 "#PWR033" H 6350 4700 50  0001 C CNN
+AR Path="/5FCC1275/5FE9A80A" Ref="#PWR035"  Part="1" 
+F 0 "#PWR035" H 6350 4700 50  0001 C CNN
 F 1 "GND" H 6355 4777 50  0000 C CNN
 F 2 "" H 6350 4950 50  0001 C CNN
 F 3 "" H 6350 4950 50  0001 C CNN
@@ -715,10 +715,10 @@ NRST
 Wire Wire Line
 	8150 2900 8300 2900
 $Comp
-L Device:C C8
+L Device:C C7
 U 1 1 5F7CBF76
 P 4600 1350
-F 0 "C8" H 4715 1396 50  0000 L CNN
+F 0 "C7" H 4715 1396 50  0000 L CNN
 F 1 "100n" H 4715 1305 50  0000 L CNN
 F 2 "" H 4638 1200 50  0001 C CNN
 F 3 "~" H 4600 1350 50  0001 C CNN
@@ -726,10 +726,10 @@ F 3 "~" H 4600 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C9
+L Device:C C8
 U 1 1 5F7CC8E6
 P 5000 1350
-F 0 "C9" H 5115 1396 50  0000 L CNN
+F 0 "C8" H 5115 1396 50  0000 L CNN
 F 1 "100n" H 5115 1305 50  0000 L CNN
 F 2 "" H 5038 1200 50  0001 C CNN
 F 3 "~" H 5000 1350 50  0001 C CNN
@@ -737,10 +737,10 @@ F 3 "~" H 5000 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C10
+L Device:C C9
 U 1 1 5F7CCD46
 P 5400 1350
-F 0 "C10" H 5515 1396 50  0000 L CNN
+F 0 "C9" H 5515 1396 50  0000 L CNN
 F 1 "100n" H 5515 1305 50  0000 L CNN
 F 2 "" H 5438 1200 50  0001 C CNN
 F 3 "~" H 5400 1350 50  0001 C CNN
@@ -748,10 +748,10 @@ F 3 "~" H 5400 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C11
+L Device:C C10
 U 1 1 5F7CD0C0
 P 5800 1350
-F 0 "C11" H 5915 1396 50  0000 L CNN
+F 0 "C10" H 5915 1396 50  0000 L CNN
 F 1 "100n" H 5915 1305 50  0000 L CNN
 F 2 "" H 5838 1200 50  0001 C CNN
 F 3 "~" H 5800 1350 50  0001 C CNN
@@ -763,8 +763,8 @@ L power:+3.3V #PWR?
 U 1 1 5F7CD321
 P 4600 950
 AR Path="/5F7CD321" Ref="#PWR?"  Part="1" 
-AR Path="/5FCC1275/5F7CD321" Ref="#PWR044"  Part="1" 
-F 0 "#PWR044" H 4600 800 50  0001 C CNN
+AR Path="/5FCC1275/5F7CD321" Ref="#PWR031"  Part="1" 
+F 0 "#PWR031" H 4600 800 50  0001 C CNN
 F 1 "+3.3V" H 4615 1123 50  0000 C CNN
 F 2 "" H 4600 950 50  0001 C CNN
 F 3 "" H 4600 950 50  0001 C CNN
@@ -772,10 +772,10 @@ F 3 "" H 4600 950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR045
+L power:GND #PWR034
 U 1 1 5F7CD895
 P 5800 1650
-F 0 "#PWR045" H 5800 1400 50  0001 C CNN
+F 0 "#PWR034" H 5800 1400 50  0001 C CNN
 F 1 "GND" H 5805 1477 50  0000 C CNN
 F 2 "" H 5800 1650 50  0001 C CNN
 F 3 "" H 5800 1650 50  0001 C CNN
@@ -857,4 +857,34 @@ Wire Wire Line
 	2250 1350 2300 1350
 Text Label 5650 4800 0    47   ~ 0
 SWIO
+$Comp
+L Power_Protection:SZNUP2105L D?
+U 1 1 5F7DECD3
+P 9200 5850
+F 0 "D?" H 9405 5896 50  0000 L CNN
+F 1 "SZNUP2105L" H 9405 5805 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 9425 5800 50  0001 L CNN
+F 3 "http://www.onsemi.com/pub_link/Collateral/NUP2105L-D.PDF" H 9325 5975 50  0001 C CNN
+	1    9200 5850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9300 5400 9300 5650
+Wire Wire Line
+	9100 5200 9100 5650
+$Comp
+L power:GND #PWR?
+U 1 1 5F7E76CB
+P 9200 6150
+AR Path="/5F7E76CB" Ref="#PWR?"  Part="1" 
+AR Path="/5FCC1275/5F7E76CB" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 9200 5900 50  0001 C CNN
+F 1 "GND" H 9205 5977 50  0000 C CNN
+F 2 "" H 9200 6150 50  0001 C CNN
+F 3 "" H 9200 6150 50  0001 C CNN
+	1    9200 6150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9200 6050 9200 6150
 $EndSCHEMATC
diff --git a/usb_switcher-cache.lib b/usb_switcher-cache.lib
index e771a7a..832dae4 100644
--- a/usb_switcher-cache.lib
+++ b/usb_switcher-cache.lib
@@ -189,75 +189,6 @@ X Pin_3 3 -200 -100 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_USB_A
-#
-DEF Connector_USB_A J 0 40 Y Y 1 F N
-F0 "J" -200 450 50 H V L CNN
-F1 "Connector_USB_A" -200 350 50 H V L CNN
-F2 "" 150 -50 50 H I C CNN
-F3 "" 150 -50 50 H I C CNN
-$FPLIST
- USB*
-$ENDFPLIST
-DRAW
-C -150 85 25 0 1 10 F
-C -25 135 15 0 1 10 F
-S -200 -300 200 300 0 1 10 f
-S -60 190 -170 210 0 1 0 F
-S -50 180 -180 230 0 1 0 N
-S -5 -300 5 -270 0 1 0 N
-S 10 50 -20 20 0 1 10 F
-S 200 -105 170 -95 0 1 0 N
-S 200 -5 170 5 0 1 0 N
-S 200 195 170 205 0 1 0 N
-P 4 0 1 10 -125 85 -100 85 -50 135 -25 135 N
-P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
-P 4 0 1 10 25 110 25 60 75 85 25 110 F
-P 2 1 1 10 -75 85 25 85 N
-X VBUS 1 300 200 100 L 50 50 1 1 W
-X D- 2 300 -100 100 L 50 50 1 1 P
-X D+ 3 300 0 100 L 50 50 1 1 P
-X GND 4 0 -400 100 U 50 50 1 1 W
-X Shield 5 -100 -400 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Connector_USB_B_Micro
-#
-DEF Connector_USB_B_Micro J 0 40 Y Y 1 F N
-F0 "J" -200 450 50 H V L CNN
-F1 "Connector_USB_B_Micro" -200 350 50 H V L CNN
-F2 "" 150 -50 50 H I C CNN
-F3 "" 150 -50 50 H I C CNN
-ALIAS USB_B_Mini
-$FPLIST
- USB*
-$ENDFPLIST
-DRAW
-C -150 85 25 0 1 10 F
-C -25 135 15 0 1 10 F
-S -200 -300 200 300 0 1 10 f
-S -5 -300 5 -270 0 1 0 N
-S 10 50 -20 20 0 1 10 F
-S 200 -205 170 -195 0 1 0 N
-S 200 -105 170 -95 0 1 0 N
-S 200 -5 170 5 0 1 0 N
-S 200 195 170 205 0 1 0 N
-P 2 0 1 10 -75 85 25 85 N
-P 4 0 1 10 -125 85 -100 85 -50 135 -25 135 N
-P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
-P 4 0 1 10 25 110 25 60 75 85 25 110 F
-P 5 0 1 0 -170 220 -70 220 -80 190 -160 190 -170 220 F
-P 9 0 1 0 -185 230 -185 220 -175 190 -175 180 -65 180 -65 190 -55 220 -55 230 -185 230 N
-X VBUS 1 300 200 100 L 50 50 1 1 w
-X D- 2 300 -100 100 L 50 50 1 1 P
-X D+ 3 300 0 100 L 50 50 1 1 P
-X ID 4 300 -200 100 L 50 50 1 1 P
-X GND 5 0 -400 100 U 50 50 1 1 w
-X Shield 6 -100 -400 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Device_C
 #
 DEF Device_C C 0 10 N Y 1 F N
@@ -448,7 +379,7 @@ F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" 0 -500 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 ALIAS MCP2562-H-SN
 $FPLIST
- SOIC*P1.27mm*
+ SOIC*3.9x4.9mm*P1.27mm*
 $ENDFPLIST
 DRAW
 S -400 300 400 -300 0 1 10 f
@@ -548,8 +479,8 @@ ENDDEF
 DEF Opendous_TS3USB221 IC 0 40 Y Y 1 F N
 F0 "IC" -250 -250 40 H V C CNN
 F1 "Opendous_TS3USB221" -175 275 30 H V C CNN
-F2 "" 0 0 47 H I C CNN
-F3 "" 0 0 47 H I C CNN
+F2 "" 0 0 118 H I C CNN
+F3 "" 0 0 118 H I C CNN
 DRAW
 S -300 250 300 -200 0 1 2 f
 X 1D+ 1 -500 200 200 R 40 40 1 1 B
@@ -566,6 +497,35 @@ X S 9 500 100 200 L 40 40 1 1 I
 ENDDRAW
 ENDDEF
 #
+# Power_Protection_SZNUP2105L
+#
+DEF Power_Protection_SZNUP2105L D 0 20 Y N 1 F N
+F0 "D" 225 100 50 H V L CNN
+F1 "Power_Protection_SZNUP2105L" 225 25 50 H V L CNN
+F2 "Package_TO_SOT_SMD:SOT-23" 225 -50 50 H I L CNN
+F3 "" 125 125 50 H I C CNN
+ALIAS SZNUP2105L
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+S -175 100 175 -100 0 1 10 f
+P 2 0 1 0 -100 100 -100 25 N
+P 2 0 1 0 0 -50 0 -100 N
+P 2 0 1 0 100 100 100 25 N
+P 4 0 1 0 -150 50 -125 25 -75 25 -50 0 N
+P 4 0 1 0 -100 25 -100 -50 100 -50 100 25 N
+P 4 0 1 0 -100 25 -75 -25 -125 -25 -100 25 N
+P 4 0 1 0 100 25 75 -25 125 -25 100 25 N
+P 4 0 1 0 100 25 125 75 75 75 100 25 N
+P 5 0 1 0 -100 25 -125 75 -75 75 -100 25 -100 50 N
+P 5 0 1 0 50 50 75 25 100 25 125 25 150 0 N
+X A 3 0 -200 100 U 50 50 0 0 P
+X K 1 -100 200 100 D 50 50 1 1 P
+X K 2 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Power_Protection_TPD2EUSB30A
 #
 DEF Power_Protection_TPD2EUSB30A U 0 0 Y Y 1 F N
@@ -760,4 +720,72 @@ X VCC 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# usb_switcher-rescue_USB_A-Connector
+#
+DEF usb_switcher-rescue_USB_A-Connector J 0 40 Y Y 1 F N
+F0 "J" -200 450 50 H V L CNN
+F1 "usb_switcher-rescue_USB_A-Connector" -200 350 50 H V L CNN
+F2 "" 150 -50 50 H I C CNN
+F3 "" 150 -50 50 H I C CNN
+$FPLIST
+ USB*
+$ENDFPLIST
+DRAW
+C -150 85 25 0 1 10 F
+C -25 135 15 0 1 10 F
+S -200 -300 200 300 0 1 10 f
+S -60 190 -170 210 0 1 0 F
+S -50 180 -180 230 0 1 0 N
+S -5 -300 5 -270 0 1 0 N
+S 10 50 -20 20 0 1 10 F
+S 200 -105 170 -95 0 1 0 N
+S 200 -5 170 5 0 1 0 N
+S 200 195 170 205 0 1 0 N
+P 4 0 1 10 -125 85 -100 85 -50 135 -25 135 N
+P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
+P 4 0 1 10 25 110 25 60 75 85 25 110 F
+P 2 1 1 10 -75 85 25 85 N
+X VBUS 1 300 200 100 L 50 50 1 1 W
+X D- 2 300 -100 100 L 50 50 1 1 P
+X D+ 3 300 0 100 L 50 50 1 1 P
+X GND 4 0 -400 100 U 50 50 1 1 W
+X Shield 5 -100 -400 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# usb_switcher-rescue_USB_B_Micro-Connector
+#
+DEF usb_switcher-rescue_USB_B_Micro-Connector J 0 40 Y Y 1 F N
+F0 "J" -200 450 50 H V L CNN
+F1 "usb_switcher-rescue_USB_B_Micro-Connector" -200 350 50 H V L CNN
+F2 "" 150 -50 50 H I C CNN
+F3 "" 150 -50 50 H I C CNN
+$FPLIST
+ USB*
+$ENDFPLIST
+DRAW
+C -150 85 25 0 1 10 F
+C -25 135 15 0 1 10 F
+S -200 -300 200 300 0 1 10 f
+S -5 -300 5 -270 0 1 0 N
+S 10 50 -20 20 0 1 10 F
+S 200 -205 170 -195 0 1 0 N
+S 200 -105 170 -95 0 1 0 N
+S 200 -5 170 5 0 1 0 N
+S 200 195 170 205 0 1 0 N
+P 2 0 1 10 -75 85 25 85 N
+P 4 0 1 10 -125 85 -100 85 -50 135 -25 135 N
+P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
+P 4 0 1 10 25 110 25 60 75 85 25 110 F
+P 5 0 1 0 -170 220 -70 220 -80 190 -160 190 -170 220 F
+P 9 0 1 0 -185 230 -185 220 -175 190 -175 180 -65 180 -65 190 -55 220 -55 230 -185 230 N
+X VBUS 1 300 200 100 L 50 50 1 1 w
+X D- 2 300 -100 100 L 50 50 1 1 P
+X D+ 3 300 0 100 L 50 50 1 1 P
+X ID 4 300 -200 100 L 50 50 1 1 P
+X GND 5 0 -400 100 U 50 50 1 1 w
+X Shield 6 -100 -400 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/usb_switcher.sch b/usb_switcher.sch
index af630ef..a2477b1 100644
--- a/usb_switcher.sch
+++ b/usb_switcher.sch
@@ -68,7 +68,7 @@ L Device:C C1
 U 1 1 5F663953
 P 950 4500
 F 0 "C1" H 1065 4546 50  0000 L CNN
-F 1 "0.1u" H 1065 4455 50  0000 L CNN
+F 1 "100n" H 1065 4455 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 988 4350 50  0001 C CNN
 F 3 "~" H 950 4500 50  0001 C CNN
 	1    950  4500
@@ -103,20 +103,7 @@ Wire Wire Line
 Wire Wire Line
 	950  4350 950  4250
 Connection ~ 950  4250
-$Comp
-L Device:C C3
-U 1 1 5F6657F0
-P 2550 4400
-F 0 "C3" H 2665 4446 50  0000 L CNN
-F 1 "0.1u" H 2665 4355 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 2588 4250 50  0001 C CNN
-F 3 "~" H 2550 4400 50  0001 C CNN
-	1    2550 4400
-	1    0    0    -1  
-$EndComp
 Connection ~ 2550 4250
-Wire Wire Line
-	2550 4750 2550 4550
 Text Notes 950  5200 0    118  ~ 24
 LDO
 $Comp
@@ -189,7 +176,7 @@ F 3 "" H 4200 2100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Connector:USB_A J3
+L usb_switcher-rescue:USB_A-Connector J3
 U 1 1 5F681203
 P 4200 1600
 F 0 "J3" H 4257 2067 50  0000 C CNN
@@ -1068,7 +1055,7 @@ Wire Wire Line
 Text Label 9500 2700 2    47   ~ 0
 VBUS_IN
 $Comp
-L Connector:USB_A J5
+L usb_switcher-rescue:USB_A-Connector J5
 U 1 1 5F76762F
 P 6900 2050
 F 0 "J5" H 6957 2517 50  0000 C CNN
@@ -1146,7 +1133,7 @@ RUSCI\nRemote USB Switch w/ CAN-Interface
 Text Label 4650 2650 0    47   ~ 0
 VBUS_B
 $Comp
-L Connector:USB_B_Micro J4
+L usb_switcher-rescue:USB_B_Micro-Connector J4
 U 1 1 5F76E88A
 P 4200 2850
 F 0 "J4" H 3800 3350 50  0000 C CNN
@@ -1186,4 +1173,19 @@ $EndComp
 Wire Wire Line
 	4550 2650 4650 2650
 Connection ~ 4550 2650
+$Comp
+L Device:C C3
+U 1 1 5F6657F0
+P 2550 4500
+F 0 "C3" H 2665 4546 50  0000 L CNN
+F 1 "0.1u" H 2665 4455 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 2588 4350 50  0001 C CNN
+F 3 "~" H 2550 4500 50  0001 C CNN
+	1    2550 4500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2550 4250 2550 4350
+Wire Wire Line
+	2550 4650 2550 4750
 $EndSCHEMATC
diff --git a/usb_switcher.sch-bak b/usb_switcher.sch-bak
index c172cb0..fc56aab 100644
--- a/usb_switcher.sch-bak
+++ b/usb_switcher.sch-bak
@@ -189,7 +189,7 @@ F 3 "" H 4200 2100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Connector:USB_A J3
+L usb_switcher-rescue:USB_A-Connector J3
 U 1 1 5F681203
 P 4200 1600
 F 0 "J3" H 4257 2067 50  0000 C CNN
@@ -1068,7 +1068,7 @@ Wire Wire Line
 Text Label 9500 2700 2    47   ~ 0
 VBUS_IN
 $Comp
-L Connector:USB_A J5
+L usb_switcher-rescue:USB_A-Connector J5
 U 1 1 5F76762F
 P 6900 2050
 F 0 "J5" H 6957 2517 50  0000 C CNN
@@ -1146,7 +1146,7 @@ RUSCI\nRemote USB Switch w/ CAN-Interface
 Text Label 4650 2650 0    47   ~ 0
 VBUS_B
 $Comp
-L Connector:USB_B_Micro J4
+L usb_switcher-rescue:USB_B_Micro-Connector J4
 U 1 1 5F76E88A
 P 4200 2850
 F 0 "J4" H 3800 3350 50  0000 C CNN
@@ -1159,10 +1159,10 @@ $EndComp
 Text Label 4650 1400 0    47   ~ 0
 VBUS_A
 $Comp
-L power:PWR_FLAG #FLG0101
+L power:PWR_FLAG #FLG02
 U 1 1 5F8345C1
 P 4550 1400
-F 0 "#FLG0101" H 4550 1475 50  0001 C CNN
+F 0 "#FLG02" H 4550 1475 50  0001 C CNN
 F 1 "PWR_FLAG" H 4550 1573 50  0000 C CNN
 F 2 "" H 4550 1400 50  0001 C CNN
 F 3 "~" H 4550 1400 50  0001 C CNN
@@ -1173,10 +1173,10 @@ Wire Wire Line
 	4550 1400 4650 1400
 Connection ~ 4550 1400
 $Comp
-L power:PWR_FLAG #FLG0102
+L power:PWR_FLAG #FLG03
 U 1 1 5F83BDED
 P 4550 2650
-F 0 "#FLG0102" H 4550 2725 50  0001 C CNN
+F 0 "#FLG03" H 4550 2725 50  0001 C CNN
 F 1 "PWR_FLAG" H 4550 2823 50  0000 C CNN
 F 2 "" H 4550 2650 50  0001 C CNN
 F 3 "~" H 4550 2650 50  0001 C CNN