@iglesias @mazumdarparijat these functions are introduced earlier in ```TreeMachine``` so i reckon we can leave them as is, as it would take quite amount of patching of other the other trees that were already there...