Metrics revision proposed 4-29-19