Updated cauldron to new format