Notify prefs were only half-moved to new method. Needs more testing