Added calculation of points