Rearranged OptionsParser,