improved event formular
Merged master fixed conflict
Merged master fixed conflict