Changed heuristics call to after the others..