Refactored trees.