inheritance changes, before refaktoring