refactored scoreboard