changes to how parser gets called