more work on patching