change 4 files, to merge with C4