Reworking the interpolation