Fix extrapolation bug; Remove extrapolation;