Optimized performance (13/28)

Optimized performance