restructure to use the new parser version
adding the new parameters