Changes to Events.java