Update with latest changes to app