Small modification for Event Handling