Test with oldTree
Make sure it works on catalog change. Remove init switch