APP OVERHAUL