Added more functionailty to BBB