improvement from older wishList