Reworked the app