Now using weighted means to account for time remaining on points