Merge please

The pref fragment