#5 apply new message structure