Add back function that was erroneously removed
reporting: simplify check
reporting: bug fix