Combined v2 with v1