changes to MainApp