[FIX]
[MERGE]
[FEAT] reporting system