Glints Adder refactored