Updated to use one event response