starting to look at smoothers
fixed merge conflicts