modified parser so stuff is easier for import