Commenting out CAS for now