Updated to new trees