Updates to heuristic to match the original project