combined two listeners into one
update comment