improved the design of a message a little bit.