Seperate return and notify emit events