Making our patching more flexible.