Improve efficiency (12/48)

Improve efficiency