changed Event class