Further Update to the app