Fix Improve performance