Revisions to flow_control