Improvement to messages