Scoreboard behavior improved