Changed back to no base class