update for latest flow