I really hope they keep the compact layout with drops and two tracks instead of gutting it and putting in a sad and lame Disneyland layout! The Magic Kingdom version is far more interesting, thrilling, and culturally significant than all the other Space Mountains in my opinion. I actually don't even mind that it's a little shaky and rickety since I feel like it adds to the fun but if replacing the track and making it smooth would mean getting rid of some of those trim breaks then it's a win. Something tells me that won't happen though and any "upgraded" version of Space will end up being a downgrade.