Reworked spectator module