Update for nearestneighbors and synthetic bbenchmarks