Need to modify the way average variables are created and reset to make
sure values are calculated properly.