sync with Alex mid-flow