Updated Scoreboard logic