working on the flow