Add dummy smoothing function
Fix merge conflict