Added some stuff. Added a 'tag' to the event names