update events
working on #140