Changes in main.java