Epoch averaging added