redo it in multiple smaller patches