Changes to Tree detect and wander