[PATCH] moved CCIs appropriately