diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java
index 3c5a14a..360e005 100644
--- a/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java
+++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java
@@ -56,17 +56,15 @@ public class OI
 	        Contract.whenPressed(new WristPlacement(false));
 
 
-			JoystickButton liftBothIntake = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.X_BUTTON);
-			liftBothIntake.whenPressed(new HatchAndBallSet(false, false));
+			JoystickButton deployBothIntakes = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.X_BUTTON);
+			deployBothIntakes.whenPressed(new HatchAndBallSet(false, false));
 
-			JoystickButton liftHatchIntake = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.RIGHT_BUMPER_BUTTON);
-			liftHatchIntake.whenPressed(new HatchAndBallSet(false, true));
-
-
-			JoystickButton liftBallIntake = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.LEFT_BUMPER_BUTTON);
-			//liftBallIntake.whenPressed(new HatchFlip(false));
-			liftBallIntake.whenPressed(new HatchAndBallSet(true, false));
+			JoystickButton deployBallIntake = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.RIGHT_BUMPER_BUTTON);
+			deployBallIntake.whenPressed(new HatchAndBallSet(false, true));
 
+			JoystickButton deployHatchIntake = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.LEFT_BUMPER_BUTTON);
+			deployHatchIntake.whenPressed(new HatchAndBallSet(true, false));
+			
 
 			JoystickButton climbUp = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.RIGHT_TRIGGER_AXIS);
 			JoystickButton climbDown = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.LEFT_TRIGGER_AXIS);