MOD: what's in the report is getting closer to what's actually in the code