optimize for v1.4