refactored options [ci skip]