yb minor changes for resub 7/28 (again)