Fix Scoreboard
Merge peformance