re-org flow fixes