updated new parser