Updated wishlist and renamed a function