3 jul feature
Add more variables and prevent duplicated reports