Changes to support measuring accuracy on the larger dataset while training