Calculated metrics now working