Rhombus and Scoreboard fix