Guests looking for the build-your-own Lightsaber will now find it in the Space Mountain gift shop. Previously at Merchant of Venus, it was kicked out when the Incredibles merchandise moved in earlier this summer. Here’s a look at the setup.

Notice: JavaScript is required for this content.