Changed v2 template