Update to App.java