adding some adaption on the flow!
changing some small adaptations on the flow