Updated for B4 Assignment