Improve efficiency (36/48)

Improve efficiency