More work done on the Cci migration