improve performance 2.5