Updated with prefs