Updated to new trees
merge