Improve patching system