New Bb with Org model changes