Added class 7 changes