Two suggestions about the messages