Final changes for calculate scores.