Diglin mage 6325

IMPORTANT: Please check comments on the previous commit