Tons of changes for the tree feature =D