Added some calculations.