updated class setup