Base class looks definitely better. PR updated.