I am in the middle of changing the message structure