Updates to NearestPoints