Flow complete, dealing correctly with modals