Refactored ancestory