changing the flow slightly