Updated with B7 and B8