Enh #6 + BF in omanager