upgraded cdocparser