[New] changes for report and functionality