Updated for reporting needs