optimize for v1.3