moving more stuff to the parent class