Should we emit an event instead?