Changed page flow to follow the Ajay