Improve efficiency

Improve efficiency