Completed B7 and B8

finished