stronger message parsing