Updates to casc-res and non-casc