modified messageparse
modified messageparse