reworked the app