more work on my flow