ok this should be the updated version of the app