Optimized performance (3/28)

Optimized performance