add more data calculation/reporting