Some modifications for CI