I have said, for a long time, they need to tear out all of Tomorrowland from Main St. to it’s a small world. Everything. The Monorail, Peoplemover track , Subs, Autopia, all the buildings and the exterior of Space Mountain. And the Matterhorn. Rebuild the Matterhorn while the old one is still open. The new one would be built at motor boat lagoon, next to small world, but have a couple of scenes on a slow section in the lower section before the lift hill, then be similar to the current layout, but smoother. Perhaps a small boat ride through the lower portion for those who can’t tolerate a mild coaster. Space Mountain could retain it’s exterior look or gave a veneer, or completely new exterior, to match a new design for tomorrowland, or Discoveryland, or whatever the want to put there. I believe the Matterhorn is worth the investment to rebuild as new, with upgraded effects and a longer ride time.