Feature/bf/mie 699

same as the previous one