now using the new monkey patched patches.  Some debug codes too