Changed option order