Reorganized options