diff --git a/CLOUDS/include/globals.hpp b/CLOUDS/include/globals.hpp
index 21846a6..0b3312a 100644
--- a/CLOUDS/include/globals.hpp
+++ b/CLOUDS/include/globals.hpp
@@ -10,7 +10,8 @@
 #define DRIVE_RATIO 0.75
 #define DRIVE_RPM 450
 
-namespace globals {
+namespace globals
+{
     extern pros::Controller master;
 
     extern pros::Motor motor_tlf;
@@ -21,8 +22,8 @@ namespace globals {
     extern pros::Motor motor_trb;
     extern pros::Motor motor_brf;
     extern pros::Motor motor_brb;
-    
-    extern pros::Imu inertial_sensor; 
+
+    extern pros::Imu inertial_sensor;
 
     extern pros::Motor_Group left_drive;
     extern pros::Motor_Group right_drive;
@@ -31,17 +32,19 @@ namespace globals {
     extern pros::ADIDigitalOut pto_piston;
     extern pros::ADIDigitalOut left_wing_piston;
     extern pros::ADIDigitalOut right_wing_piston;
-    extern pros::ADIDigitalOut climb_piston;
+    extern pros::ADIDigitalOut climb_piston_one;
+    extern pros::ADIDigitalOut climb_piston_two;
 
     extern Wings wings;
     extern Timer timer;
 
     extern Drive chassis;
 
-    extern pros::Motor& intake_mtr;
-    extern pros::Motor& cata_mtr;
+    extern pros::Motor &intake_mtr;
+    extern pros::Motor &cata_mtr;
 
-    enum e_controlsch {
+    enum e_controlsch
+    {
         RENU,
         RIA,
         CHRIS
diff --git a/CLOUDS/src/globals.cpp b/CLOUDS/src/globals.cpp
index 01fbe61..c3cd184 100644
--- a/CLOUDS/src/globals.cpp
+++ b/CLOUDS/src/globals.cpp
@@ -17,32 +17,33 @@ namespace globals {
         {-16, 1, 4, -3}, -> right
     */
 
-    pros::Motor motor_tlf(14, MOTOR_GEARSET_06, false);
-    pros::Motor motor_blb(9, MOTOR_GEARSET_06, true);
-    pros::Motor motor_blf(2, MOTOR_GEARSET_06, true);
-    pros::Motor motor_tlb(7, MOTOR_GEARSET_06, false);
-    pros::Motor motor_trf(15, MOTOR_GEARSET_06, true);
-    pros::Motor motor_trb(6, MOTOR_GEARSET_06, true);
-    pros::Motor motor_brf(12, MOTOR_GEARSET_06, false);
-    pros::Motor motor_brb(5, MOTOR_GEARSET_06, false);
+    pros::Motor motor_tlf(8, MOTOR_GEARSET_06, false);
+    pros::Motor motor_blb(12, MOTOR_GEARSET_06, true);
+    pros::Motor motor_blf(19, MOTOR_GEARSET_06, true);
+    pros::Motor motor_tlb(15, MOTOR_GEARSET_06, false);
+    pros::Motor motor_trf(7, MOTOR_GEARSET_06, true);
+    pros::Motor motor_trb(16, MOTOR_GEARSET_06, true);
+    pros::Motor motor_brf(9, MOTOR_GEARSET_06, false);
+    pros::Motor motor_brb(17, MOTOR_GEARSET_06, false);
 
-    pros::Imu inertial_sensor(11);
+    pros::Imu inertial_sensor(10);
 
     pros::Motor_Group left_drive({ motor_tlf, motor_tlb, motor_blf, motor_blb });
     pros::Motor_Group right_drive({ motor_trf, motor_trb, motor_brf, motor_brb });
 
     /* PNEUMATICS */
-    pros::ADIDigitalOut pto_piston('A');
-    pros::ADIDigitalOut left_wing_piston('E');
-    pros::ADIDigitalOut right_wing_piston('F');
-    pros::ADIDigitalOut climb_piston('B'); 
+    pros::ADIDigitalOut pto_piston('H');
+    pros::ADIDigitalOut left_wing_piston('A');
+    pros::ADIDigitalOut right_wing_piston('B');
+    pros::ADIDigitalOut climb_piston_one('C');
+    pros::ADIDigitalOut climb_piston_two('D');
 
     Wings wings;
     Timer timer;
 
     Drive chassis(
-        {14, -9, -2, 7},
-        {-15, 12, 5, -6},
+        { 8, -12, -19, 15 },
+        { -7, 9, 17, -16 },
         18,
         WHEEL_SIZE,
         600,