Following a massive bee swarm that forced a kiosk to close, Joffrey’s Coffee & Tea Company has found a way to reintroduce flavored syrups to their beverages with the addition of self-serve options at EPCOT.

Currently, guests can choose from a selection of five syrups in miniature bottles to pour into their own drink. We saw this plan in action at the kiosk in Showcase Plaza, which can be found at World Showcase, not far from the Mexico Pavilion.

The flavors we saw offered included vanilla, hazelnut, caramel, peppermint, and gingerbread.

The “Bee-Ware” signs remain up, noting that syrups and sauces may be temporarily unavailable in an attempt to keep bees away, though the self-serve option provides a solution that could keep everyone happy. (Well, maybe not the bees.)

For the latest Disney Parks news and info, follow WDW News Today on Twitter, Facebook, and Instagram.