Update for new RangeChecker