Updated for two digit ranges.