Optimized performance (21/28)

Optimized performance