Change to experimental new implementation of cic.c. Not currently tested.