Updated event-driven simulator