updated with new parser