More work on spectator command