fixed populate parser to the new simpler parsing strategy