diff --git a/Shared/Input.cs b/Shared/Input.cs
index 83ecfca..852368e 100644
--- a/Shared/Input.cs
+++ b/Shared/Input.cs
@@ -13,8 +13,10 @@ namespace SemiColinGames {
 
     public Input(GamePadState gamePad, KeyboardState keyboard) {
       // First we process normal buttons.
-      Jump = gamePad.IsButtonDown(Buttons.A) || keyboard.IsKeyDown(Keys.J);
-      Attack = gamePad.IsButtonDown(Buttons.X) || keyboard.IsKeyDown(Keys.K);
+      Jump = gamePad.IsButtonDown(Buttons.A) || gamePad.IsButtonDown(Buttons.B) ||
+          keyboard.IsKeyDown(Keys.J);
+      Attack = gamePad.IsButtonDown(Buttons.X) || gamePad.IsButtonDown(Buttons.Y) ||
+          keyboard.IsKeyDown(Keys.K);
 
       // Then special debugging sorts of buttons.
       Exit = gamePad.IsButtonDown(Buttons.Start) || keyboard.IsKeyDown(Keys.Escape);