diff --git a/connect_switch.ino b/connect_switch.ino
index cf8c323..cfd4c98 100644
--- a/connect_switch.ino
+++ b/connect_switch.ino
@@ -24,7 +24,7 @@ struct ButtonInfo {
 };
 
 struct arrow arrowTable[4];
-#define ButtonInfoTableSize 2
+#define ButtonInfoTableSize 9
 struct ButtonInfo buttonInfoTable[ButtonInfoTableSize];
 
 
@@ -70,7 +70,14 @@ void setup()
   MsTimer2::start();
 
   setupButton(&(buttonInfoTable[0]), 3, Button::B);
-  setupButton(&(buttonInfoTable[1]), 15, Button::PLUS);
+  setupButton(&(buttonInfoTable[1]), 4, Button::X);
+  setupButton(&(buttonInfoTable[2]), 5, Button::Y);
+  setupButton(&(buttonInfoTable[3]), 16, Button::L);
+  setupButton(&(buttonInfoTable[4]), 10, Button::R);
+  setupButton(&(buttonInfoTable[5]), 15, Button::PLUS);
+  setupButton(&(buttonInfoTable[6]), 18, Button::HOME);
+  setupButton(&(buttonInfoTable[7]), 19, Button::CAPTURE);
+  setupButton(&(buttonInfoTable[8]), 14, Button::MINUS);
 
 /*
   bButton.pinNumber = 3;