Refactored Favorites.