diff --git a/src/main/deploy/pathplanner/autos/2 Piece from Center Subwoofer to Center Note.auto b/src/main/deploy/pathplanner/autos/2 Piece from Center Subwoofer to Center Note.auto
index f6d1b85..d91fa8d 100644
--- a/src/main/deploy/pathplanner/autos/2 Piece from Center Subwoofer to Center Note.auto	
+++ b/src/main/deploy/pathplanner/autos/2 Piece from Center Subwoofer to Center Note.auto	
@@ -2,7 +2,7 @@
   "version": 1.0,
   "startingPose": {
     "position": {
-      "x": 1.3070140425995143,
+      "x": 1.4661550043820806,
       "y": 5.55593454044051
     },
     "rotation": 180.0
diff --git a/src/main/deploy/pathplanner/paths/Bottom Center Line Note to Shooting at the Bottom.path b/src/main/deploy/pathplanner/paths/Bottom Center Line Note to Shooting at the Bottom.path
index ce932ab..1faef80 100644
--- a/src/main/deploy/pathplanner/paths/Bottom Center Line Note to Shooting at the Bottom.path	
+++ b/src/main/deploy/pathplanner/paths/Bottom Center Line Note to Shooting at the Bottom.path	
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.75,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 3.34,
+        "maxAcceleration": 3.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",
diff --git a/src/main/deploy/pathplanner/paths/Bottom Subwoofer to Bottom Note.path b/src/main/deploy/pathplanner/paths/Bottom Subwoofer to Bottom Note.path
index 2fd4a83..ae1ed64 100644
--- a/src/main/deploy/pathplanner/paths/Bottom Subwoofer to Bottom Note.path	
+++ b/src/main/deploy/pathplanner/paths/Bottom Subwoofer to Bottom Note.path	
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 0.5985054075371309,
-        "y": 4.394832649314422
+        "x": 0.7158327706968803,
+        "y": 4.209895599278378
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.1358695135097423,
-        "y": 4.142197614701699
+        "x": 1.2531968766694916,
+        "y": 3.9572605646656553
       },
       "isLocked": false,
       "linkedName": null
diff --git a/src/main/deploy/pathplanner/paths/Middle Bottom Center Line Note to Shooting at the Bottom.path b/src/main/deploy/pathplanner/paths/Middle Bottom Center Line Note to Shooting at the Bottom.path
index d6803aa..9a27ebe 100644
--- a/src/main/deploy/pathplanner/paths/Middle Bottom Center Line Note to Shooting at the Bottom.path	
+++ b/src/main/deploy/pathplanner/paths/Middle Bottom Center Line Note to Shooting at the Bottom.path	
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.7,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 3.34,
+        "maxAcceleration": 3.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",
diff --git a/src/main/deploy/pathplanner/paths/Middle Top Center Line Note to Shooting at the Center.path b/src/main/deploy/pathplanner/paths/Middle Top Center Line Note to Shooting at the Center.path
index 50205ab..a874140 100644
--- a/src/main/deploy/pathplanner/paths/Middle Top Center Line Note to Shooting at the Center.path	
+++ b/src/main/deploy/pathplanner/paths/Middle Top Center Line Note to Shooting at the Center.path	
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.85,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 3.34,
+        "maxAcceleration": 3.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",
diff --git a/src/main/deploy/pathplanner/paths/Top Center Line Note to Shooting at the Center.path b/src/main/deploy/pathplanner/paths/Top Center Line Note to Shooting at the Center.path
index b732a85..f2b6878 100644
--- a/src/main/deploy/pathplanner/paths/Top Center Line Note to Shooting at the Center.path	
+++ b/src/main/deploy/pathplanner/paths/Top Center Line Note to Shooting at the Center.path	
@@ -29,7 +29,19 @@
     }
   ],
   "rotationTargets": [],
-  "constraintZones": [],
+  "constraintZones": [
+    {
+      "name": "New Constraints Zone",
+      "minWaypointRelativePos": 0.8,
+      "maxWaypointRelativePos": 1.0,
+      "constraints": {
+        "maxVelocity": 3.34,
+        "maxAcceleration": 3.0,
+        "maxAngularVelocity": 450.0,
+        "maxAngularAcceleration": 360.0
+      }
+    }
+  ],
   "eventMarkers": [
     {
       "name": "New Event Marker",
diff --git a/src/main/deploy/pathplanner/paths/Top Subwoofer to Top Note.path b/src/main/deploy/pathplanner/paths/Top Subwoofer to Top Note.path
index 13bf0a5..10c0fe4 100644
--- a/src/main/deploy/pathplanner/paths/Top Subwoofer to Top Note.path	
+++ b/src/main/deploy/pathplanner/paths/Top Subwoofer to Top Note.path	
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 0.6075736712876936,
-        "y": 6.67
+        "x": 0.6690561529271205,
+        "y": 6.817692039942485
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.0513833513478605,
-        "y": 6.9959524255030345
+        "x": 1.1128658329872878,
+        "y": 7.14364446544552
       },
       "isLocked": false,
       "linkedName": null
diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
index 5694b1f..fbbf8c1 100644
--- a/src/main/java/frc/robot/Constants.java
+++ b/src/main/java/frc/robot/Constants.java
@@ -159,32 +159,46 @@ public static class Presets {
     
     static {
       //Old Points
-      SHOOTER_DISTANCE_ANGLE.put(0.735, 57.50);
-      SHOOTER_DISTANCE_ANGLE.put(1.755, 43.78);
-      SHOOTER_DISTANCE_ANGLE.put(1.823, 43.44);
-      SHOOTER_DISTANCE_ANGLE.put(2.543, 38.15);
-      SHOOTER_DISTANCE_ANGLE.put(3.149, 35.13);
-      SHOOTER_DISTANCE_ANGLE.put(3.500, 28.27);
-      SHOOTER_DISTANCE_ANGLE.put(3.807, 33.56);
+      // SHOOTER_DISTANCE_ANGLE.put(0.735, 57.50);
+      // SHOOTER_DISTANCE_ANGLE.put(1.755, 43.78);
+      // SHOOTER_DISTANCE_ANGLE.put(1.823, 43.44);
+      // SHOOTER_DISTANCE_ANGLE.put(2.543, 38.15);
+      // SHOOTER_DISTANCE_ANGLE.put(3.149, 35.13);
+      // SHOOTER_DISTANCE_ANGLE.put(3.500, 28.27);
+      // SHOOTER_DISTANCE_ANGLE.put(3.807, 33.56);
 
       //NYC Regional
-
-
+      SHOOTER_DISTANCE_ANGLE.put(1.451101767427388, 53.738839285714285);
+      SHOOTER_DISTANCE_ANGLE.put(1.414185456363615, 54.87984793526786);
+      SHOOTER_DISTANCE_ANGLE.put(2.1285865676795237, 48.21742466517858);
+      SHOOTER_DISTANCE_ANGLE.put(2.487748521528895, 42.895333426339285);
+      SHOOTER_DISTANCE_ANGLE.put(3.0782159514727163, 40.37318638392857);
+      SHOOTER_DISTANCE_ANGLE.put(2.1774294348986682, 47.06856863839286);
+      SHOOTER_DISTANCE_ANGLE.put(3.2592748390692776, 37.72705078125);
+      SHOOTER_DISTANCE_ANGLE.put(0.8629958355261691, 64.55252511160714);
     };
 
     public static final InterpolatingDoubleTreeMap ELEVATOR_DISTANCE_HEIGHT = new InterpolatingDoubleTreeMap();
 
     static {
       //Old Points
-      ELEVATOR_DISTANCE_HEIGHT.put(0.735, 0.078);
-      ELEVATOR_DISTANCE_HEIGHT.put(1.755, 0.061);
-      ELEVATOR_DISTANCE_HEIGHT.put(1.823, 0.031);
-      ELEVATOR_DISTANCE_HEIGHT.put(2.543, 0.024);
-      ELEVATOR_DISTANCE_HEIGHT.put(3.149, 0.029);
-      ELEVATOR_DISTANCE_HEIGHT.put(3.500, 0.010);
-      ELEVATOR_DISTANCE_HEIGHT.put(3.807, 0.009);
+      // ELEVATOR_DISTANCE_HEIGHT.put(0.735, 0.078);
+      // ELEVATOR_DISTANCE_HEIGHT.put(1.755, 0.061);
+      // ELEVATOR_DISTANCE_HEIGHT.put(1.823, 0.031);
+      // ELEVATOR_DISTANCE_HEIGHT.put(2.543, 0.024);
+      // ELEVATOR_DISTANCE_HEIGHT.put(3.149, 0.029);
+      // ELEVATOR_DISTANCE_HEIGHT.put(3.500, 0.010);
+      // ELEVATOR_DISTANCE_HEIGHT.put(3.807, 0.009);
 
       //NYC Regional
+      ELEVATOR_DISTANCE_HEIGHT.put(1.451101767427388, 0.05916796875);
+      ELEVATOR_DISTANCE_HEIGHT.put(1.414185456363615, 0.062373046875);
+      ELEVATOR_DISTANCE_HEIGHT.put(2.1285865676795237, 0.0343037109375);
+      ELEVATOR_DISTANCE_HEIGHT.put(2.487748521528895, 0.017803710937499998);
+      ELEVATOR_DISTANCE_HEIGHT.put(3.0782159514727163, 0.021448242187499997);
+      ELEVATOR_DISTANCE_HEIGHT.put(2.1774294348986682, 0.046933593749999995);
+      ELEVATOR_DISTANCE_HEIGHT.put(3.2592748390692776, 0.0175693359375);
+      ELEVATOR_DISTANCE_HEIGHT.put(0.8629958355261691, 0.09472265625);
     }
   }
 
diff --git a/src/main/java/frc/robot/subsystems/ShooterSubsystem.java b/src/main/java/frc/robot/subsystems/ShooterSubsystem.java
index 4eb50c8..15d724a 100644
--- a/src/main/java/frc/robot/subsystems/ShooterSubsystem.java
+++ b/src/main/java/frc/robot/subsystems/ShooterSubsystem.java
@@ -54,7 +54,7 @@ public class ShooterSubsystem extends SubsystemBase {
 
   private final Timer _revTimer = new Timer();
 
-  private double _shooterTrim = 5;
+  private double _shooterTrim = 0;
 
   private boolean _holdNote = false;