Adding checks to determine to do range-based checking.