Improved Options.