Optimized performance (25/28)

Optimized performance