Updated to reflect changes in the app