diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index aadf1b4e3..a42f0bbc1 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -376,7 +376,7 @@ private void configureButtonBindings() {
         .toggleOnTrue(orchestrator.spinUpShooterHub());
     operatorController.leftTrigger(0.1).toggleOnTrue(orchestrator.spinUpShooterTest());
     operatorController.y().whileTrue(indexer.reverse());
-    operatorController.x().whileTrue(intake.outtake());
+    //    operatorController.x().whileTrue(intake.outtake());
 
     operatorController
         .leftTrigger()
diff --git a/src/main/java/frc/robot/Schematic.java b/src/main/java/frc/robot/Schematic.java
index 6d09a11d8..38d064911 100644
--- a/src/main/java/frc/robot/Schematic.java
+++ b/src/main/java/frc/robot/Schematic.java
@@ -83,18 +83,18 @@ public class Schematic {
         pigeonCanId = 17;
 
         // Drive (CAN Ids)
-        frontLeftDriveCanId = 3;
-        frontLeftTurnCanId = 4;
-        frontRightDriveCanId = 1;
-        frontRightTurnCanId = 2;
-
-        backRightDriveCanId = 7;
-        backRightTurnCanId = 8;
-        backLeftDriveCanId = 5;
-        backLeftTurnCanId = 6;
-
-        frontLeftAbsoluteEncoderCanId = 19;
-        frontRightAbsoluteEncoderCanId = 18;
+        frontLeftDriveCanId = 1;
+        frontLeftTurnCanId = 2;
+        frontRightDriveCanId = 3;
+        frontRightTurnCanId = 4;
+
+        backRightDriveCanId = 5;
+        backRightTurnCanId = 6;
+        backLeftDriveCanId = 7;
+        backLeftTurnCanId = 8;
+
+        frontLeftAbsoluteEncoderCanId = 18;
+        frontRightAbsoluteEncoderCanId = 19;
         backRightAbsoluteEncoderCanId = 20;
         backLeftAbsoluteEncoderCanId = 21;