added some heuristic