Mage build (6/21)

Mage build