optimize for v2.0