yb minor changes for response on  7/28 (again)