Updated metrics
Formatting