Improve block order