Added Scoreboard.
Merge Fix.