updated format
completed all tests for messaging