Tidying. Adding events.