revert last commit, re-ticking breaks with panning
Merge branch 'subtree'