Optimisations and full tree 2