Patched for version 3