Changes to RangeParser. Untested in project