Optimize gas performance
Optimize gas performance