updated events to match the new architecture.