Added option to extrapolate using neighbors