Changed the way the message is added