Revised options to be optional.