Forgot to update bfi_init()