refactored glyphs again