Tweak thresholds, remove the old divide by 1000