order() speed improved