Changed parse opt ordering