More incremental changes to modify option.