Use a better form of patches