Converted solution for new ReportViewer