some changes (appear to have broken report generation)