B1 and B2 changes made