Class 1/2 update