Making Gen 3 Wish Work Better