Further work on app