- parse_body improved