move some functionality from the sub- to the baseclass