Refactor workflow for Fast and normal mode

duplicated code but the steps are more clear now and in the right order