Enhancement:

 - Further consolidation
 - Use sphere search for all possible candidates