--Many changes to report function