started events refactor