modified messages
modified a little