Progress  Fixing interpolation