Starbucks fans can now get free refills for some drinks — but not all. The coffee chain is also bringing back its self-serve milk and sweeteners bar.

“Today, I’m making a commitment: We’re getting back to Starbucks,” he wrote. “We’re refocusing on what has always set Starbucks apart — a welcoming coffeehouse where people gather, and where we serve the finest coffee, handcrafted by our skilled baristas. This is our enduring identity. We will innovate from here.”

Starbucks is implementing new and old policies at its cafes in the United States and Canada to improve the customer experience. Beginning on Monday, customers who order a “for here” beverage can also get free refills of hot or iced coffee or hot or iced tea during their visit.