Use the new switchStream method from the player. Refactored logic.