Added scoreboard logic