class 7 and 8

updates