This step function step-by-flow improvements and correct noticed