Rework the different flows to make them specs-compliant