Increase performance (34/48)

Increase performance