Changed the flow of the model.