Compute average margin as well
Compute average margin as well