New Implementation Working For all except Favorites