Addd more oprtion changes