Added Options

changed to have options instead of individual options