did some reorganizing in Event