refactoring of heuristics, adding heuristics