Added client-side interpolation