restored BBM to old implementation