Updated closest point algorithm
Merge