Merge regrid changes

Unclear to me why they can't be merged, maybe if i click send pull request ill understand