finished up the 2 metrics