changes in class 4/28