The ranges are smarter now.

BsuBugz: 3114