(#2393) - WIP - try to use tree height measurements