Revamp of resources/reports