improve performance
1.0.1