Updated event driven simulator