update to new dispatch events semantics