diff --git a/simgui.json b/simgui.json
index 2a82376..de51bfc 100644
--- a/simgui.json
+++ b/simgui.json
@@ -195,7 +195,7 @@
             0.0,
             0.8500000238418579
           ],
-          "height": 0,
+          "height": 338,
           "series": [
             {
               "color": [
diff --git a/src/main/java/frc/robot/auto/Auto.java b/src/main/java/frc/robot/auto/Auto.java
index 41d0768..05f45fc 100644
--- a/src/main/java/frc/robot/auto/Auto.java
+++ b/src/main/java/frc/robot/auto/Auto.java
@@ -72,8 +72,8 @@ private Auto() {
         swerve);
 
     NamedCommands.registerCommand("stow", superstructure.stow());
-    NamedCommands.registerCommand("shoot", Commands.deadline(Commands.waitSeconds(3.0), superstructure.speaker()));
-    NamedCommands.registerCommand("intake", superstructure.intake());
+    NamedCommands.registerCommand("shoot", superstructure.speaker().withTimeout(1.5));
+    NamedCommands.registerCommand("intake", superstructure.intake().withTimeout(1.5));
 
     autoChooser = AutoBuilder.buildAutoChooser();
   }