Updates to class 1