MV RQ - flow rework pass1