Switched to more general tree