major overhaul on the application