changed the base class