Simplified some options