Add pre-calculation of points