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.

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.

Starbucks rolls out new initiatives in order to bring forth a sense of community, and one of these initiatives is returning to writing names on cups.