patches-pass2