- change structure and user messages