diff --git a/src/main/java/frc/robot/swerve/SwerveSubsystem.java b/src/main/java/frc/robot/swerve/SwerveSubsystem.java
index d4a93fc..90d4c05 100644
--- a/src/main/java/frc/robot/swerve/SwerveSubsystem.java
+++ b/src/main/java/frc/robot/swerve/SwerveSubsystem.java
@@ -226,29 +226,16 @@ public void driveTeleop(double x, double y, double theta) {
       leftX *= -1.0;
       leftY *= -1.0;
     }
-     DogLog.log("Swerve/leftX", leftX);
-      DogLog.log("Swerve/LeftY", leftY);
-
-    // raw input -> polar conversion
-    if(leftX != 0 || leftY != 0){
-    double r = Math.sqrt(Math.pow(leftX, 2) + Math.pow(leftY, 2));
-    double polarTheta = Math.atan(leftY/leftX);
-      DogLog.log("Swerve/radius", r);
-      DogLog.log("Swerve/polartheta", polarTheta);
-
-    // polar -> xytheta
-    double polarX = (r * Math.cos(polarTheta) * Math.sqrt(Math.pow(Math.sin(polarTheta), 2) + 1));
-    double polarY = (r * Math.sin(polarTheta) * Math.sqrt(Math.pow(Math.sin(polarTheta), 2) + 1));
-      DogLog.log("Swerve/polarx", polarX);
-      DogLog.log("Swerve/polary", polarY);
-    }
 
-    // xytheta -> swerve
+      //https://stackoverflow.com/a/32391780
+      var mappedX = 1/2* Math.sqrt( 2 + Math.pow(leftX, 2) - Math.pow(leftY, 2) + 2*leftX*Math.sqrt(2)) - 1/2* Math.sqrt( 2 + Math.pow(leftX, 2) - Math.pow(leftY, 2) - 2*leftX*Math.sqrt(2));
+    var mappedY =  1/2* Math.sqrt( 2 - Math.pow(leftX, 2) + Math.pow(leftY, 2) + 2*leftY*Math.sqrt(2)) - 1/2* Math.sqrt( 2 - Math.pow(leftX, 2) + Math.pow(leftY, 2) - 2*leftY*Math.sqrt(2));
+
     teleopSpeeds =
         new ChassisSpeeds(
           0,0,0
-        //    -1.0 * polarY * MaxSpeed,
-        //    polarX * MaxSpeed,
+        //    -1.0 *mappedY * MaxSpeed,
+        //    mappedX * MaxSpeed,
          //   rightX * TELEOP_MAX_ANGULAR_RATE.getRadians()
          );