upgraded v1