diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 1946b56d7b..0ac85c61dd 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -61,6 +61,8 @@ SourceFiles
 #include "plane.H"
 #include "SortableList.H"
 #include "meshTools.H"
+#include "dynamicIndexedOctree.H"
+#include "dynamicTreeDataPoint.H"
 #include "indexedOctree.H"
 #include "treeDataPoint.H"
 #include "unitConversion.H"
@@ -662,16 +664,16 @@ private:
         (
             pointIndexHit& pHit,
             DynamicList<Foam::point>& newEdgeLocations,
-            pointField& existingEdgeLocations,
-            autoPtr<indexedOctree<treeDataPoint> >& edgeLocationTree
+            DynamicList<Foam::point>& existingEdgeLocations,
+            dynamicIndexedOctree<dynamicTreeDataPoint>& edgeLocationTree
         ) const;
 
         //- Build or rebuild the edgeLocationTree
-        void buildEdgeLocationTree
-        (
-            autoPtr<indexedOctree<treeDataPoint> >& edgeLocationTree,
-            const pointField& existingEdgeLocations
-        ) const;
+//        void buildEdgeLocationTree
+//        (
+//            autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint> >& edgeLocationTree,
+//            const pointField& existingEdgeLocations
+//        ) const;
 
         //- Build or rebuild the sizeAndAlignmentTree
         void buildSizeAndAlignmentTree() const;
@@ -691,8 +693,8 @@ private:
             DynamicList<pointIndexHit>& featureEdgeHits,
             DynamicList<label>& featureEdgeFeaturesHit,
             DynamicList<Foam::point>& newEdgeLocations,
-            pointField& existingEdgeLocations,
-            autoPtr<indexedOctree<treeDataPoint> >& edgeLocationTree
+            DynamicList<Foam::point>& existingEdgeLocations,
+            dynamicIndexedOctree<dynamicTreeDataPoint>& edgeLocationTree
         ) const;
 
         //- Store the surface conformation with the indices offset to be
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index ecea3b2d7e..4a76612dd2 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -128,12 +128,27 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
     // Initialise containers to store the edge conformation locations
     DynamicList<Foam::point> newEdgeLocations;
 
-    pointField existingEdgeLocations(0);
+    DynamicList<Foam::point> existingEdgeLocations;
 
-    autoPtr<indexedOctree<treeDataPoint> > edgeLocationTree;
+    treeBoundBox overallBb
+    (
+        geometryToConformTo_.globalBounds().extend(rndGen_, 1e-4)
+    );
+
+    overallBb.min() -= Foam::point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
+    overallBb.max() += Foam::point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
+
+    dynamicIndexedOctree<dynamicTreeDataPoint> edgeLocationTree
+    (
+        dynamicTreeDataPoint(existingEdgeLocations),
+        overallBb,  // overall search domain
+        10,         // max levels
+        10.0,       // maximum ratio of cubes v.s. cells
+        100.0       // max. duplicity; n/a since no bounding boxes.
+    );
 
     // Initialise the edgeLocationTree
-    buildEdgeLocationTree(edgeLocationTree, existingEdgeLocations);
+    //buildEdgeLocationTree(edgeLocationTree, existingEdgeLocations);
 
     label initialTotalHits = 0;
 
@@ -1830,8 +1845,8 @@ bool Foam::conformalVoronoiMesh::nearFeatureEdgeLocation
 (
     pointIndexHit& pHit,
     DynamicList<Foam::point>& newEdgeLocations,
-    pointField& existingEdgeLocations,
-    autoPtr<indexedOctree<treeDataPoint> >& edgeLocationTree
+    DynamicList<Foam::point>& existingEdgeLocations,
+    dynamicIndexedOctree<dynamicTreeDataPoint>& edgeLocationTree
 ) const
 {
     const Foam::point pt = pHit.hitPoint();
@@ -1841,37 +1856,25 @@ bool Foam::conformalVoronoiMesh::nearFeatureEdgeLocation
     // 0.01 and 1000 determined from speed tests, varying the indexedOctree
     // rebuild frequency and balance of additions to queries.
 
-    if
-    (
-        newEdgeLocations.size()
-     >= max(0.01*existingEdgeLocations.size(), 1000)
-    )
-    {
-        const label originalSize = existingEdgeLocations.size();
 
-        existingEdgeLocations.append(newEdgeLocations);
 
-        buildEdgeLocationTree(edgeLocationTree, existingEdgeLocations);
+    label startIndex = existingEdgeLocations.size();
+
+    existingEdgeLocations.append(newEdgeLocations);
+
+    label endIndex = existingEdgeLocations.size();
+
+    edgeLocationTree.insert(startIndex, endIndex);
+
+    newEdgeLocations.clear();
+
+    pointIndexHit info = edgeLocationTree.findNearest(pt, exclusionRangeSqr);
 
-        newEdgeLocations.clear();
-    }
-    else
-    {
-        // Search for the nearest point in newEdgeLocations.
-        // Searching here first, because the intention is that the value of
-        // newEdgeLocationsSizeLimit should make this faster by design.
 
-        if (min(magSqr(newEdgeLocations - pt)) <= exclusionRangeSqr)
-        {
-            // Average the points...
-            return true;
-        }
-    }
 
     // Searching for the nearest point in existingEdgeLocations using the
     // indexedOctree
 
-    pointIndexHit info = edgeLocationTree().findNearest(pt, exclusionRangeSqr);
 
     // Average the points...
 //    if (info.hit())
@@ -1917,32 +1920,32 @@ bool Foam::conformalVoronoiMesh::nearFeatureEdgeLocation
 }
 
 
-void Foam::conformalVoronoiMesh::buildEdgeLocationTree
-(
-    autoPtr<indexedOctree<treeDataPoint> >& edgeLocationTree,
-    const pointField& existingEdgeLocations
-) const
-{
-    treeBoundBox overallBb
-    (
-        geometryToConformTo_.globalBounds().extend(rndGen_, 1e-4)
-    );
-
-    overallBb.min() -= Foam::point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
-    overallBb.max() += Foam::point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
-
-    edgeLocationTree.reset
-    (
-        new indexedOctree<treeDataPoint>
-        (
-            treeDataPoint(existingEdgeLocations),
-            overallBb,  // overall search domain
-            10,         // max levels
-            10.0,       // maximum ratio of cubes v.s. cells
-            100.0       // max. duplicity; n/a since no bounding boxes.
-        )
-    );
-}
+//void Foam::conformalVoronoiMesh::buildEdgeLocationTree
+//(
+//    autoPtr<indexedOctree<treeDataPoint> >& edgeLocationTree,
+//    DynamicList<Foam::point>& existingEdgeLocations
+//) const
+//{
+//    treeBoundBox overallBb
+//    (
+//        geometryToConformTo_.globalBounds().extend(rndGen_, 1e-4)
+//    );
+//
+//    overallBb.min() -= Foam::point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
+//    overallBb.max() += Foam::point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
+//
+//    edgeLocationTree.reset
+//    (
+//        new indexedOctree<treeDataPoint>
+//        (
+//            treeDataPoint(existingEdgeLocations),
+//            overallBb,  // overall search domain
+//            10,         // max levels
+//            10.0,       // maximum ratio of cubes v.s. cells
+//            100.0       // max. duplicity; n/a since no bounding boxes.
+//        )
+//    );
+//}
 
 
 void Foam::conformalVoronoiMesh::buildSizeAndAlignmentTree() const
@@ -1990,8 +1993,8 @@ void Foam::conformalVoronoiMesh::addSurfaceAndEdgeHits
     DynamicList<pointIndexHit>& featureEdgeHits,
     DynamicList<label>& featureEdgeFeaturesHit,
     DynamicList<Foam::point>& newEdgeLocations,
-    pointField& existingEdgeLocations,
-    autoPtr<indexedOctree<treeDataPoint> >& edgeLocationTree
+    DynamicList<Foam::point>& existingEdgeLocations,
+    dynamicIndexedOctree<dynamicTreeDataPoint>& edgeLocationTree
 ) const
 {
     bool keepSurfacePoint = true;