Really added logic for reports