Optimize calculations
0.0.4