Added new heuristics