Some changes here and there
Prepare new example glassware