Improve range and choices