Updated application flow