Added extrapolation