diff --git a/src/control/mod.rs b/src/control/mod.rs
index 70ec44e..d6b7c50 100644
--- a/src/control/mod.rs
+++ b/src/control/mod.rs
@@ -4,7 +4,6 @@ use crate::{
     GameState,
     head::ActiveHead,
     heads_database::{HeadControls, HeadsDatabase},
-    player::PlayerBodyMesh,
 };
 
 mod collisions;
@@ -75,7 +74,7 @@ fn head_change(
     query: Query<&ActiveHead, Changed<ActiveHead>>,
     heads_db: Res<HeadsDatabase>,
     mut selected_controller: ResMut<SelectedController>,
-    mut rig_transform_q: Option<Single<&mut Transform, With<PlayerBodyMesh>>>,
+    mut event_controller_switch: EventWriter<ControllerSwitchEvent>,
 ) {
     for head in query.iter() {
         let stats = heads_db.head_stats(head.0);
@@ -85,11 +84,7 @@ fn head_change(
         };
 
         if selected_controller.0 != controller {
-            if controller == ControllerSet::ApplyControlsRun {
-                if let Some(mut transform) = rig_transform_q.take() {
-                    transform.rotation = Quat::IDENTITY;
-                }
-            }
+            event_controller_switch.send(ControllerSwitchEvent);
 
             selected_controller.0 = controller;
         }