UPDATE - fix Event to work / Javadoc