changed .map to .tree, etc