fixed interpolation. Wesley's approach works better