Keep with testing and event creation