diff --git a/src/display3d.rs b/src/display3d.rs
index ef9130e..2bfc686 100644
--- a/src/display3d.rs
+++ b/src/display3d.rs
@@ -89,19 +89,14 @@ impl Plugin for Display3dPlugin {
                     .run_if(in_state(ai::PlayState::Human)),
                 vantage_point 
                     .run_if(in_state(GameState::Play))
-                    .run_if(
-                        in_state(PlayState::Human)
-                            .and_then(not(state_changed::<game::TurnState>))
-                    )
-                    // Do not run if it is the opponents turn while playing against AI
-                    .run_if(
-                        in_state(PlayState::AiBogo)
-                            .and_then(not(in_state(TurnState(Side::A)))
-                        )
-                    )
-                    .run_if(any_component_added::<Selected>()
-                        .or_else(any_component_removed::<Selected>())
-                    ),
+                    .run_if(in_state(PlayState::AiBogo))
+                    .run_if(in_state(TurnState(Side::B)))
+                    .run_if(any_component_added::<Selected>().or_else(any_component_removed::<Selected>())),
+                vantage_point 
+                    .run_if(in_state(GameState::Play))
+                    .run_if(in_state(PlayState::Human))
+                    .run_if(not(state_changed::<TurnState>))
+                    .run_if(any_component_added::<Selected>().or_else(any_component_removed::<Selected>())),
                 update_pieces
                     .run_if(resource_exists::<tweak::GameTweaks>)
                     .run_if(in_state(GameState::Play))