Bit more tree work