Added spectator logic