Updated thresholds following discussion.