Change the way how the average of the momentum is computed