fixed BnB
fixed the last stuff