changed Base class