WIP commit - small changes in produceReport code