Added interpolation code