Integrate messages
 Add comments, Add messages