FULL PATCHED VERSION (1)