Updated logic in class Scores