add some options and refactor

should be 1