Fix bug in wrong file
Add new report
Use new class(22)