Improve draft implementation of distance guessing heuristic