Changes to app flow