upgraded v2.0 + prod