Events updated for greater clarity and correctness