Added parse_buf