Changed how the messages are set up ...