2 Commits (fix-add-events)