Added some of that fancy flow preservation