changes in Main.java