Changes to MainClass