new calculation values and further optimizations