Fixed interpolation. Refactoring.