shifted to v2 as default