slight changes with classes