Ident changes
Improved the event simulator