additional edits to remove pundit