Re-writing x step with interpolation. Works really well for discontinuous data.