ISSUE #20 - Re-enabled tree