Improve efficiency (1/48)

Improve efficiency