Converted ImprovedCauldron to new system.