Changed values and indices to methods that take a subtree=True/False argument