Big changes to the application