updated to add some controls aroud what metrics get produced