updated class 2 & 3