updates to class1 and class2