Improve 'closest point' bottleneck