Changes to score generator