Updated according to the new BLL