Modified for ci_reporter