More changes to Octree