1.5.2 - updated heuristics. Getting complex. Still avoiding false positives.