improve performance

improve performance