Fixing Mario Kart Wii Retro Courses

Since my last topic was popular and someone suggested I fix the Mario Kart Wii retro course selection here's what I came up with. This doesn't continue from my DS retro course selection so some of the same courses will be here except for courses which were already used in the actual Mario Kart DS.

Shell Cup - DS Figure-8 Circuit, GCN Peach Beach, SNES Ghost Valley 2, N64 Kalimari Desert
Banana Cup - N64 Sherbet Land, GBA Cheese Land, DS Delfino Square, GCN Waluigi Stadium
Leaf Cup - DS Tick-Tock Clock, GBA Ribbon Road, N64 Yoshi Valley, GCN Mushroom City
Lightning Cup - DS Peach Gardens, GCN DK Mountain, N64 Bowser's Castle, SNES Rainbow Road

Notes
1. Most of these cups are mostly the same as before except for the Leaf cup which is completely different as it needed the most improvement.
2. I was torn between including N64 Royal Raceway or N64 Yoshi Valley but went with the latter since Royal Raceway should have been in Mario Kart 7 or 8 like it was due to the big jump which made an excellent glider section in Mario Kart 8.
3. I wanted to leave the Shell Cup as is but ultimately replaced DS Yoshi Falls with Figure-8 Circuit since I already added another Yoshi course, and I replaced N64 Mario Raceway with N64 Kalimari Desert because I didn't want two circuits in the same cup and there's no desert course except maybe Cheese Land but that isn't really a desert.
4. I left out Waluigi Pinball on purpose since I wanted to keep Waluigi Stadium.
5. I wanted to include Airship Fortress in the Lightning Cup but then there would be three straight courses which were all final courses in their respective Star Cups and wanted to save some of those for later games.
6. DS Tick-Tock Clock and DS Peach Gardens could easily change cups but I put the latter in the Lightning Cup as it was already in the Wii Lightning Cup to begin with.

I was the person who suggested that btw.