some heuristic changes