changed regex to include TreeWalker