adding event support refs #5