added switch for options