Updated for my prefs