yb finalized changes for resub 7/27