wip flow-mod changes