Some reworking of Tree