Responding to PR comments
merge set_events