Added calculation of that stuff