rework tree again...