Fixing the tree vars to reflect new method