Refactor to Glydar