Reorder some steps to flow better