pref changes
merging