latest changes
needed base class