Improved event performance