Subtree now graph-based