Update to cater for Cases