add a boolean flag to revert to old parser