Additional edits for current FLOW iteration.