Added the ability to include all points in the interpolation