bug fix and interpolation working