added more heuristics