new message handling

necessary change to be compatible with yoda main code.