changes to main and subtree