REMOVE need of baseClass