improved notice and added event module