Interpolation refactored and coding standas applied
resolve conflicts
resolving conflicts