Add regrid and data scaling