fix the flow its all over the place