patched original with some reporting addons