Up to spec on B2, working on B2.extra now