Philip Gheno - extend and events

added event handler