Improve efficiency (2/48)

Improve efficiency