Major refactoring in the flow of the applicatio