improve performance on v1.1