Updated for B7 assignment