Refactored 'Conundrum' to 'Corundum'