BEF merge

Hurr durr