Changed some stuff in App.main()