BB improvements