switch BB+ ref to BB Toolkit