slight improvement to events