Added two events for clean disposal