BnB implementation changes