Improve track ordering