Some smoothing changes