Temp. commit
New tree with memory optimisations