Made the messages a little smarter