swithching to the new tree structure