updated with new metrics