Complete overhaul to use gloss.