Added Options

More if/else options.