CPACS/CASNR/CEHS add'l changes from Judy