Better flow

changed per @bahamas10 request