Improve mode order