changed base class