added support for v3