updated class scheme