B-0 small changes with latest updates