diff --git a/src/main/java/com/team766/robot/common/DriverOI.java b/src/main/java/com/team766/robot/common/DriverOI.java
index e06be0fba..982e558dd 100644
--- a/src/main/java/com/team766/robot/common/DriverOI.java
+++ b/src/main/java/com/team766/robot/common/DriverOI.java
@@ -37,8 +37,8 @@ public DriverOI(Drive drive, JoystickReader leftJoystick, JoystickReader rightJo
                                                 > 0);
     }
 
-    public void handleOI(Context context) {
-
+    @Override
+    protected void handlePre() {
         // Negative because forward is negative in driver station
         leftJoystickX =
                 -createJoystickDeadzone(leftJoystick.getAxis(InputConstants.AXIS_FORWARD_BACKWARD))
@@ -51,7 +51,10 @@ public void handleOI(Context context) {
         rightJoystickY =
                 -createJoystickDeadzone(rightJoystick.getAxis(InputConstants.AXIS_LEFT_RIGHT))
                         * ControlConstants.MAX_ROTATIONAL_VELOCITY; // For steer
+    }
 
+    @Override
+    protected void handleOI(Context context) {
         if (leftJoystick.getButtonPressed(InputConstants.BUTTON_RESET_GYRO)) {
             drive.resetGyro();
         }