1. almost fix issue #1
2. use new option
3. add things.