BF2 with internal changes