diff --git a/components/HIERARCHY b/components/HIERARCHY
index 5a92266..7b8a4d3 100644
--- a/components/HIERARCHY
+++ b/components/HIERARCHY
@@ -126,6 +126,7 @@ Connector
 		MEMCARD8
 		MEMCARD8-SHIELD4
 		MEMCARD8-SHIELD3-SW1
+		MEMCARD8-SHIELD4-SW1
 		MEMCARD8-SHIELD4-SW
 	Circular
 		DIN_5_2S
diff --git a/components/memcard8.lib b/components/memcard8.lib
index 28bdca4..518352b 100644
--- a/components/memcard8.lib
+++ b/components/memcard8.lib
@@ -1,42 +1,13 @@
-EESchema-LIBRARY Version 2.3  Date: Sat Dec 22 19:58:28 2012
+EESchema-LIBRARY Version 2.3  Date: Tue Dec 30 13:04:33 2014
 #encoding utf-8
 #
-# MEMCARD8-SHIELD4
-#
-DEF MEMCARD8-SHIELD4 CON 0 40 Y N 1 F N
-F0 "CON" -100 500 60 H V L CNN
-F1 "MEMCARD8-SHIELD4" 150 -450 60 H V C CNN
-DRAW
-T 0 115 300 60 0 0 0 CD/DAT3  Normal 0 C C
-T 0 10 0 60 0 0 0 CLK  Normal 0 C C
-T 0 15 200 60 0 0 0 CMD  Normal 0 C C
-T 0 30 -200 60 0 0 0 DAT0  Normal 0 C C
-T 0 30 -300 60 0 0 0 DAT1  Normal 0 C C
-T 0 25 400 60 0 0 0 DAT2  Normal 0 C C
-T 900 350 -150 60 0 0 0 SHIELD  Normal 0 C C
-T 0 10 100 60 0 0 0 VDD  Normal 0 C C
-T 0 10 -100 60 0 0 0 VSS  Normal 0 C C
-S -100 450 400 -350 0 0 0 N
-X 1 1 -350 400 250 R 50 50 1 1 P
-X 2 2 -350 300 250 R 50 50 1 1 P
-X 3 3 -350 200 250 R 50 50 1 1 P
-X 4 4 -350 100 250 R 50 50 1 1 P
-X 5 5 -350 0 250 R 50 50 1 1 P
-X 6 6 -350 -100 250 R 50 50 1 1 P
-X 7 7 -350 -200 250 R 50 50 1 1 P
-X 8 8 -350 -300 250 R 50 50 1 1 P
-X SHIELD S1 700 0 300 L 50 50 1 1 W
-X SHIELD S2 700 -100 300 L 50 50 1 1 W
-X SHIELD S3 700 -200 300 L 50 50 1 1 W
-X SHIELD S4 700 -300 300 L 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
 # MEMCARD8-SHIELD3-SW1
 #
 DEF MEMCARD8-SHIELD3-SW1 CON 0 40 Y N 1 F N
 F0 "CON" -100 500 60 H V L CNN
 F1 "MEMCARD8-SHIELD3-SW1" 250 -450 60 H V C CNN
+F2 "~" 0 0 60 H V C CNN
+F3 "~" 0 0 60 H V C CNN
 DRAW
 T 900 450 250 60 0 0 0 CARD  Normal 0 C C
 T 0 115 300 60 0 0 0 CD/DAT3  Normal 0 C C
@@ -65,11 +36,46 @@ X SW SW 900 400 300 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# MEMCARD8-SHIELD4
+#
+DEF MEMCARD8-SHIELD4 CON 0 40 Y N 1 F N
+F0 "CON" -100 500 60 H V L CNN
+F1 "MEMCARD8-SHIELD4" 150 -450 60 H V C CNN
+F2 "~" 0 0 60 H V C CNN
+F3 "~" 0 0 60 H V C CNN
+DRAW
+T 0 115 300 60 0 0 0 CD/DAT3  Normal 0 C C
+T 0 10 0 60 0 0 0 CLK  Normal 0 C C
+T 0 15 200 60 0 0 0 CMD  Normal 0 C C
+T 0 30 -200 60 0 0 0 DAT0  Normal 0 C C
+T 0 30 -300 60 0 0 0 DAT1  Normal 0 C C
+T 0 25 400 60 0 0 0 DAT2  Normal 0 C C
+T 900 350 -150 60 0 0 0 SHIELD  Normal 0 C C
+T 0 10 100 60 0 0 0 VDD  Normal 0 C C
+T 0 10 -100 60 0 0 0 VSS  Normal 0 C C
+S -100 450 400 -350 0 0 0 N
+X 1 1 -350 400 250 R 50 50 1 1 P
+X 2 2 -350 300 250 R 50 50 1 1 P
+X 3 3 -350 200 250 R 50 50 1 1 P
+X 4 4 -350 100 250 R 50 50 1 1 P
+X 5 5 -350 0 250 R 50 50 1 1 P
+X 6 6 -350 -100 250 R 50 50 1 1 P
+X 7 7 -350 -200 250 R 50 50 1 1 P
+X 8 8 -350 -300 250 R 50 50 1 1 P
+X SHIELD S1 700 0 300 L 50 50 1 1 W
+X SHIELD S2 700 -100 300 L 50 50 1 1 W
+X SHIELD S3 700 -200 300 L 50 50 1 1 W
+X SHIELD S4 700 -300 300 L 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # MEMCARD8-SHIELD4-SW
 #
 DEF MEMCARD8-SHIELD4-SW CON 0 40 Y N 1 F N
 F0 "CON" -100 500 60 H V L CNN
 F1 "MEMCARD8-SHIELD4-SW" 250 -450 60 H V C CNN
+F2 "~" 0 0 60 H V C CNN
+F3 "~" 0 0 60 H V C CNN
 DRAW
 T 900 450 250 60 0 0 0 CARD  Normal 0 C C
 T 0 115 300 60 0 0 0 CD/DAT3  Normal 0 C C
@@ -100,4 +106,40 @@ X SW2 SW2 900 300 300 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# MEMCARD8-SHIELD4-SW1
+#
+DEF MEMCARD8-SHIELD4-SW1 CON 0 40 Y N 1 F N
+F0 "CON" -100 500 60 H V L CNN
+F1 "MEMCARD8-SHIELD4-SW1" 250 -450 60 H V C CNN
+F2 "~" 0 0 60 H V C CNN
+F3 "~" 0 0 60 H V C CNN
+DRAW
+T 900 450 250 60 0 0 0 CARD  Normal 0 C C
+T 0 115 300 60 0 0 0 CD/DAT3  Normal 0 C C
+T 0 10 0 60 0 0 0 CLK  Normal 0 C C
+T 0 15 200 60 0 0 0 CMD  Normal 0 C C
+T 0 30 -200 60 0 0 0 DAT0  Normal 0 C C
+T 0 30 -300 60 0 0 0 DAT1  Normal 0 C C
+T 0 25 400 60 0 0 0 DAT2  Normal 0 C C
+T 900 550 250 60 0 0 0 DETECT  Normal 0 C C
+T 900 550 -150 60 0 0 0 SHIELD  Normal 0 C C
+T 0 10 100 60 0 0 0 VDD  Normal 0 C C
+T 0 10 -100 60 0 0 0 VSS  Normal 0 C C
+S -100 450 600 -350 0 1 0 N
+X 1 1 -350 400 250 R 50 50 1 1 P
+X 2 2 -350 300 250 R 50 50 1 1 P
+X 3 3 -350 200 250 R 50 50 1 1 P
+X 4 4 -350 100 250 R 50 50 1 1 P
+X 5 5 -350 0 250 R 50 50 1 1 P
+X 6 6 -350 -100 250 R 50 50 1 1 P
+X 7 7 -350 -200 250 R 50 50 1 1 P
+X 8 8 -350 -300 250 R 50 50 1 1 P
+X SHIELD S1 900 0 300 L 50 50 1 1 W
+X SHIELD S2 900 -100 300 L 50 50 1 1 W
+X SHIELD S3 900 -200 300 L 50 50 1 1 W
+X SHIELD S4 900 -300 300 L 50 50 1 1 W
+X SW SW 900 400 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 #End Library