Updated GlassHandler