Optimize calls
1.0.8