Performance Improve