Changes in Main.java