simplify the flow. It was confusing