NOJIRA More changes for reporting