2nd merge

interpolation stuff