Improved ordering