Slight changes for new scoreboard implementation