refactoring, the values are in an OptionValues object