added inheritance stuff