Removed the scoreboard until more efficient way found