@lsmith77 will this make us walk the tree correctly?