change message structure