Re-arrange order