Tree() and Branch() were reorganized