Changes in main and scoring classes.