Added ability to select "None" as an option.