adding message parsing