Update to v6