yb minor changes for resub 7/27