Improved the ordering