Edit to C1 and image reordering