Repatch and reformat