Redid the way I calculate weighted averages