Worked more on metrics