Merge branch 'newTrees'