Made some changes with my inheritance