some inheritance changes