Adjustments to heuristics, also uses material