Performance Optimized

To speed up