very sizable change for actually diffing based on heuristics