Moved to an interpolation, rather than already-at-grid-point method