CIC changes (fix soon)