class 5 and other changes