Improve message order