New Options

Making this Pull Request to fix merge conflicts