Even better (and working) flow