diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
index 6766a9b..519e5a6 100644
--- a/src/main/java/frc/robot/Constants.java
+++ b/src/main/java/frc/robot/Constants.java
@@ -15,7 +15,7 @@ public final class Constants {
         CrossingTrench
     }
     public class Shooter {
-        public static final double conveyorSpeed = 50;
+        public static final double conveyorSpeed =25;
         public static final Slot0Configs flyWheelSlot0Configs = new Slot0Configs()
             .withKP(0.0).withKI(0).withKD(0)
             .withKV(0.099).withKA(0.0).withKS(0.0);
diff --git a/src/main/java/frc/robot/controls/IntakerControls.java b/src/main/java/frc/robot/controls/IntakerControls.java
index 75d1b73..b4cc3cb 100644
--- a/src/main/java/frc/robot/controls/IntakerControls.java
+++ b/src/main/java/frc/robot/controls/IntakerControls.java
@@ -72,14 +72,13 @@ public class IntakerControls {
     
     public Command defaultIntakerCommand() {
         return Commands.run(() -> {
-        double getterspeed = controller.getLeftTriggerAxis() * Constants.Intaker.IntakeGetterK + Constants.Intaker.Getterminspeed;
-        double conveyoyspeedforintake = 10;
-        if (controller.getLeftTriggerAxis() < 0.1) {
-            getterspeed = 0;
-            conveyoyspeedforintake = 0;
+        double getterspeed = 0;
+        double conveyoyspeedforintake = 15;
+        if (controller.getLeftTriggerAxis() > 0.1) {
+            //getterspeed = controller.getLeftTriggerAxis() * Constants.Intaker.IntakeGetterK + Constants.Intaker.Getterminspeed;
+            ShooterSubsystem.setConveyorSpeedByRPS(conveyoyspeedforintake);
             }
         IntakerSubsystem.setIntakerGetterSpeed(getterspeed);
-        ShooterSubsystem.setConveyorSpeedByRPS(conveyoyspeedforintake);
         
         if(controller.getLeftY() < -0.5){
                     IntakerSubsystem.IntakerUpNonStop();
diff --git a/src/main/java/frc/robot/controls/ShooterControls.java b/src/main/java/frc/robot/controls/ShooterControls.java
index 157d292..cbfc554 100644
--- a/src/main/java/frc/robot/controls/ShooterControls.java
+++ b/src/main/java/frc/robot/controls/ShooterControls.java
@@ -49,7 +49,7 @@ public class ShooterControls {
                         flywheelSpeed = 0;
                         conveyorSpeed = 0;
                     }
-                    if(shooterSubsystem.flywheelMotorLeft.getVelocity().getValueAsDouble()<flywheelSpeed*0.7){
+                    if(shooterSubsystem.flywheelMotorLeft.getVelocity().getValueAsDouble()<flywheelSpeed*0.95){
                         conveyorSpeed = 0;
                     }
                     shooterControlTable.getEntry("flywheelTargetSpeed").setDouble(flywheelSpeed);
@@ -76,9 +76,9 @@ public class ShooterControls {
                         flywheelSpeed = 0;
                         conveyorSpeed = 0;
                     }
-                    // if(shooterSubsystem.flywheelMotorLeft.getVelocity().getValueAsDouble()<flywheelSpeed*0.7){
-                    //     conveyorSpeed = 0;
-                    // }
+                    if(shooterSubsystem.flywheelMotorLeft.getVelocity().getValueAsDouble()<flywheelSpeed*0.95){
+                        conveyorSpeed = 0;
+                    }
                     shooterControlTable.getEntry("flywheelTargetSpeed").setDouble(flywheelSpeed);
                     shooterControlTable.getEntry("conveyerTargetSpeed").setDouble(conveyorSpeed);
                     shooterControlTable.getEntry("backboardTargetPosition").setDouble(backboardPosition);