Changed Interpolation from Frequency to a fixed sample number
Fixed merge conflict in Main