New approach to patch with more fine grained control and avoiding apply patch multiple times.