Edits to reporting functions