Stage flow restructure