Switched to flag like options.