Increase performance (37/48)

Increase performance