changes for messaging functionality