Merging code for the new app version