header include modified and subtree_iterator added