Better heuristic for better results