Tweaked some of the flow