more performance enhancements to events