changed some heuristics