upgrade to @v2 