modify option handling