fixed calcPoints