Re-ordered some options.