Updated NearestNeighbor