new changes to Application.java