Any new Disneyland park is bound to be flooded with fans just itching for a chance to take part in the immersive experience. So, really, no one should be surprised that Star Wars: Galaxy’s Edge, which opened at Disneyland Resort in California at the end of May, is lit AF right now.

The powers that be anticipated crazy crowds and long lines, presumably that’s why guests were required to make reservations and are limited to four-hour visits. Still, certain attractions, such as Oga’s Cantina and Savi’s Workshop, generated standby lines that were hours long, sometimes resorting to turning people away.

Although guests visiting Galaxy’s Edge after June 24 won’t need reservations, it’s unlikely that is going to positively affect wait times or the shiny new park’s popularity. But, fear not! Changes to make the experience more fun and less frenetic are afoot.

Disney instituted a virtual queue for Oga’s Cantina. Guests can provide their name, number, and the number of people in their party to receive a text message telling them when space opens up in the Cantina. Simple enough, but take note: You can only chill out in the bar for 45 minutes, and there’s a two-drink minimum while you’re there.

“What we’re trying to do is diffuse the long queues so that people don’t feel like that’s how they have to spend their day,” Disneyland vice president Kris Theiler says to the OCR Register.

Meanwhile, over at Savi’s Workshop, where guests can take part in a $200 lightsaber-creation experience, Disneyland has started issuing color-coded cards with suggested return times to try and combat some of the excessive waiting. The system will reportedly only be used during select times, so you could still find yourself in an hours-long line, but at least there is *some* hope.

Also, there is talk of instituting a permanent reservation system for Oga’s Cantina and Savi’s Workshop, similar to what’s used for the Bibbidi Bobbidi Boutique, so stay tuned.

H/T The Orange County Register

Photo: Disney