New flow and lots of updates