diff --git a/src/main/java/frc4388/robot/Constants.java b/src/main/java/frc4388/robot/Constants.java
index 81c0cc1..6a4d44d 100644
--- a/src/main/java/frc4388/robot/Constants.java
+++ b/src/main/java/frc4388/robot/Constants.java
@@ -90,7 +90,7 @@ public final class Constants {
     }
     
     public static final class ClimberConstants {
-        public static final int CLIMBER_SPARK_ID = -1;
+        public static final int CLIMBER_SPARK_ID = 10;
     }
   
     public static final class LevelerConstants {
diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java
index fa1ed02..92150de 100644
--- a/src/main/java/frc4388/robot/RobotContainer.java
+++ b/src/main/java/frc4388/robot/RobotContainer.java
@@ -69,7 +69,7 @@ public class RobotContainer {
         // drives intake with input from triggers on the opperator controller
         m_robotIntake.setDefaultCommand(new RunIntakeWithTriggers(m_robotIntake, getOperatorController()));
         // drives climber with input from triggers on the opperator controller
-        m_robotClimber.setDefaultCommand(new RunClimberWithTriggers(m_robotClimber, getDriverController()));
+        m_robotClimber.setDefaultCommand(new RunClimberWithTriggers(m_robotClimber, getOperatorController()));
         // continually sends updates to the Blinkin LED controller to keep the lights on
         m_robotLED.setDefaultCommand(new RunCommand(() -> m_robotLED.updateLED(), m_robotLED));
         // runs the drum shooter in idle mode
@@ -134,8 +134,8 @@ public class RobotContainer {
             .whenPressed(new InstantCommand(() -> System.out.print("Gamer"), m_robotDrive));
 
         // safety for climber and leveler
-        new JoystickButton(getOperatorJoystick(), XboxController.START_BUTTON)
-            .whileHeld(new InstantCommand(() -> m_robotClimber.setSafetyPressed(), m_robotClimber))
+        new JoystickButton(getOperatorJoystick(), XboxController.BACK_BUTTON)
+            .whenPressed(new InstantCommand(() -> m_robotClimber.setSafetyPressed(), m_robotClimber))
             .whenReleased(new InstantCommand(() -> m_robotClimber.setSafetyNotPressed(), m_robotClimber));
 
         /* Storage Neo PID Test */