Points calculation now working correctly