Tree reworked