yb (nearly) finalized changes for resub