Revised option set based on new structure as of this morning