update to class 1 and 2