Refactored Tree