slight changes for base classes