Event system little redone