Revert "Calculation"

This reverts commit 04c31e871c83dd6406941b171607b05749b07e01.
Revert "Revert "Calculation""

This reverts commit 631a3c23ab12f5ee13ab5a7c0119e69b636425d2.