improved point-finding