refactor to one results event