improve performance
1.1.9