diff --git a/include/config.h b/include/config.h
index be7030600..f724b8907 100644
--- a/include/config.h
+++ b/include/config.h
@@ -65,9 +65,11 @@
 // Remove course specific camera processing
 #define CAMERA_FIX
 // Change the movement speed when hanging from a ceiling
-#define HANGING_SPEED 4.f
+#define HANGING_SPEED 12.f
 // Makes Mario face the direction of the analog stick directly while hanging from a ceiling, without doing "semicircles"
 #define TIGHTER_HANGING_CONTROLS
+// Makes Mario turn around instantly when moving on the ground
+//#define SUPER_RESPONSIVE_CONTROLS
 // Disables fall damage
 #define NO_FALL_DAMAGE
 // Disables the scream that mario makes when falling off a great height (this is separate from actual fall damage)
diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c
index ec10da90e..e7b483077 100644
--- a/src/game/mario_actions_moving.c
+++ b/src/game/mario_actions_moving.c
@@ -386,8 +386,13 @@ void update_shell_speed(struct MarioState *m) {
         m->forwardVel = 64.0f;
     }
 
+#ifdef SUPER_RESPONSIVE_CONTROLS
+    m->faceAngle[1] = m->intendedYaw;
+#else
     m->faceAngle[1] =
         m->intendedYaw - approach_s32((s16)(m->intendedYaw - m->faceAngle[1]), 0, 0x800, 0x800);
+#endif
+
 
     apply_slope_accel(m);
 }