Made use of the new Event Handler functions