Revert "Revert "improve Growpatch""

This reverts commit fe47d1184564a189557b7c1c1e53a3d3c6db31d8.