F39 proposal: BiggerESP (Self-Contained Change proposal)