More work on the scoreboard