Changes to the Main class