Draft changes in cc_lis