Updated for B6 assignment