changes in Main class