Added withoutBF option