More changes to the flow logic.