Improved options.