Update for Caloris 1.0