If you are a fan of Disney California Adventure’s “Tower of Terror” attraction you should ride it soon – as it is reportedly in store for a major change.

According to MiceChat, the ride will lose its “Twilight Zone” theme in favor of a “Guardians of the Galaxy” storyline – with the ride shutting down in September, then reopening in May:

The plan is for the original Twilight Zone backstory to be removed entirely, and replaced with an all new show based around the Collector character from the Guardians movie franchise.

The report claims that Disney has been testing the new show in the elevators of the ride for the last few months.

The timing of the attraction’s reopening would coincide with the release of the sequel to Guardians of the Galaxy – which is lated to be released on May 5, 2017.

And this might not be all when it comes to new attractions based on the Marvel Universe:

The plan now is to adjust the Marvel mega-coaster from its original spot in the Timon parking lot to fit into the northern end of Hollywood where Stage 17, Monsters Inc., and the unused Stage 12 buildings are. This would save Timon for future DCA expansion, and better use the under-utilized space on the opposite side of Hollywood Land.

No word on what character or characters the mega-coaster would be based on – but, guessing the “mega” description would leave out “Ant-Man”.