some changes for messaging