Improve Range and choices