updated option handling