completed new cpt parser