Completed new tree handling