Tweaked & patched