Some more work on the calcinator