Updated event listener