Improved Treewalker