Major changes to tree construction, untested