Changes to work with new range parameter.