GH-30 update the interp part