Improve ordering