Added some calculations