Simplify options #7