Redid the design of messages